Improved Future.complete

hprose · Nov 18, 2016 · 8c12191 · 8c12191
1 parent 4dd7584
commit 8c12191
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 13 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
     "author": "Ma Bingyao <[email protected]>",
     "name": "hprose",
-    "version": "2.0.24",
+    "version": "2.0.25",
     "description": "Hprose is a High Performance Remote Object Service Engine.",
     "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/dist/hprose.src.js b/dist/hprose.src.js
@@ -1,4 +1,4 @@
-// Hprose for JavaScript v2.0.24
+// Hprose for JavaScript v2.0.25
 // Copyright (c) 2008-2016 http://hprose.com
 // Hprose is freely distributable under the MIT license.
 // For all details and documentation:
@@ -2411,7 +2411,8 @@ hprose.global = (
             );
         } },
         complete: { value: function(oncomplete) {
-           return this.then(oncomplete, oncomplete);
+            oncomplete = oncomplete || function(v) { return v; };
+            return this.then(oncomplete, oncomplete);
         } },
         always: { value: function(oncomplete) {
            this.done(oncomplete, oncomplete);

diff --git a/example/hprose.js b/example/hprose.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hprose-js",
   "filename": "hprose.js",
-  "version": "2.0.24",
+  "version": "2.0.25",
   "description": "Hprose is a High Performance Remote Object Service Engine.",
   "homepage": "https://github.com/hprose",
   "license": "MIT",

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

diff --git a/src/Future.js b/src/Future.js
@@ -690,7 +690,8 @@
             );
         } },
         complete: { value: function(oncomplete) {
-           return this.then(oncomplete, oncomplete);
+            oncomplete = oncomplete || function(v) { return v; };
+            return this.then(oncomplete, oncomplete);
         } },
         always: { value: function(oncomplete) {
            this.done(oncomplete, oncomplete);

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