Update to v2.0.5

xiaojian001 · Jul 3, 2016 · dd99a74 · dd99a74
1 parent 9194df8
commit dd99a74
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 43 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
     "author": "Ma Bingyao <[email protected]>",
     "name": "hprose",
-    "version": "2.0.4",
+    "version": "2.0.5",
     "description": "Hprose is a High Performance Remote Object Service Engine. It is a modern, lightweight, cross-language, cross-platform, object-oriented, high performance, remote dynamic communication middleware.",
     "keywords": [
         "hprose",

diff --git a/dist/hprose.js b/dist/hprose.js
diff --git a/dist/hprose.min.js b/dist/hprose.min.js
diff --git a/example/hprose.js b/example/hprose.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hprose",
   "filename": "hprose.js",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Hprose is a High Performance Remote Object Service Engine. It is a modern, lightweight, cross-language, cross-platform, object-oriented, high performance, remote dynamic communication middleware. It is not only easy to use, but powerful. You just need a little time to learn, then you can use it to easily construct cross language cross platform distributed application system.",
   "homepage": "https://github.com/hprose",
   "keywords": [

diff --git a/src/Client.js b/src/Client.js
@@ -12,7 +12,7 @@
  *                                                        *
  * hprose client for JavaScript.                          *
  *                                                        *
- * LastModified: Apr 1, 2016                              *
+ * LastModified: Jul 4, 2016                              *
  * Author: Ma Bingyao <[email protected]>                  *
  *                                                        *
 \**********************************************************/
@@ -982,14 +982,9 @@
             _invokeHandler = _invokeHandlers.reduceRight(
             function(next, handler) {
                 return function(name, args, context) {
-                    try {
-                        var result = handler(name, args, context, next);
-                        if (Future.isFuture(result)) { return result; }
-                        return Future.value(result);
-                    }
-                    catch (e) {
-                        return Future.error(e);
-                    }
+                    return Future.sync(function() {
+                        return handler(name, args, context, next);
+                    });
                 };
             }, invokeHandler);
         }
@@ -998,14 +993,9 @@
             _batchInvokeHandler = _batchInvokeHandlers.reduceRight(
             function(next, handler) {
                 return function(batches, context) {
-                    try {
-                        var result = handler(batches, context, next);
-                        if (Future.isFuture(result)) { return result; }
-                        return Future.value(result);
-                    }
-                    catch (e) {
-                        return Future.error(e);
-                    }
+                    return Future.sync(function() {
+                        return handler(batches, context, next);
+                    });
                 };
             }, batchInvokeHandler);
         }
@@ -1014,14 +1004,9 @@
             _beforeFilterHandler = _beforeFilterHandlers.reduceRight(
             function(next, handler) {
                 return function(request, context) {
-                    try {
-                        var response = handler(request, context, next);
-                        if (Future.isFuture(response)) { return response; }
-                        return Future.value(response);
-                    }
-                    catch (e) {
-                        return Future.error(e);
-                    }
+                    return Future.sync(function() {
+                        return handler(request, context, next);
+                    });
                 };
             }, beforeFilterHandler);
         }
@@ -1030,14 +1015,9 @@
             _afterFilterHandler = _afterFilterHandlers.reduceRight(
             function(next, handler) {
                 return function(request, context) {
-                    try {
-                        var response = handler(request, context, next);
-                        if (Future.isFuture(response)) { return response; }
-                        return Future.value(response);
-                    }
-                    catch (e) {
-                        return Future.error(e);
-                    }
+                    return Future.sync(function() {
+                        return handler(request, context, next);
+                    });
                 };
             }, afterFilterHandler);
         }

diff --git a/src/CopyRight.js b/src/CopyRight.js
@@ -1,4 +1,4 @@
-// Hprose for JavaScript v2.0.3
+// Hprose for JavaScript v2.0.5
 // Copyright (c) 2008-2016 http://hprose.com
 // Hprose is freely distributable under the MIT license.
 // For all details and documentation:

diff --git a/test/Gruntfile.js b/test/Gruntfile.js
@@ -17,6 +17,9 @@ module.exports = function (grunt) {
   }, {
     browserName: 'android',
     version: '5.1'
+  }, {
+    browserName: 'iphone',
+    version: '9.3'
   }, {
     browserName: 'iphone',
     version: '9.2'
@@ -53,6 +56,9 @@ module.exports = function (grunt) {
   }, {
     browserName: 'iphone',
     version: '5.1'
+  }, {
+    browserName: 'ipad',
+    version: '9.3'
   }, {
     browserName: 'ipad',
     version: '9.2'
@@ -301,6 +307,14 @@ module.exports = function (grunt) {
     browserName: 'internet explorer',
     platform: 'Windows XP',
     version: '6.0'
+  }, {
+    browserName: 'opera',
+    platform: 'Linux',
+    version: '12.12'
+  }, {
+    browserName: 'opera',
+    platform: 'Windows 7',
+    version: '12.12'
   }, {
     browserName: 'opera',
     platform: 'Windows 7',

diff --git a/test/hprose.js b/test/hprose.js