From 2b184efc473eb6e326c72a8fbb09ae554bcbb97a Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 17 May 2016 13:15:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3App=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/App.php | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/library/think/App.php b/library/think/App.php
index 2760b88a..f4d1404c 100644
--- a/library/think/App.php
+++ b/library/think/App.php
@@ -100,9 +100,6 @@ class App
                     // 规则闭包
                     $data = self::invokeFunction($dispatch['function'], $dispatch['params']);
                     break;
-                case 'finish':
-                    // 已经完成 不再继续执行
-                    break;
                 default:
                     throw new Exception('dispatch type not support', 10008);
             }
@@ -111,16 +108,16 @@ class App
         }
 
         // 监听app_end
-        APP_HOOK && Hook::listen('app_end', isset($data) ? $data : '');
-        if (isset($data)) {
-            // 输出数据到客户端
-            if ($data instanceof Response) {
-                return $data->send();
-            } else {
-                $type = IS_AJAX ? Config::get('default_ajax_return') : Config::get('default_return_type');
-                return Response::create($data, $type)->send();
-            }
+        APP_HOOK && Hook::listen('app_end', $data);
+
+        // 输出数据到客户端
+        if ($data instanceof Response) {
+            return $data->send();
+        } elseif (!is_null($data)) {
+            $type = IS_AJAX ? Config::get('default_ajax_return') : Config::get('default_return_type');
+            return Response::create($data, $type)->send();
         }
+
     }
 
     // 执行函数或者闭包方法 支持参数调用