Fixed a bug of Future.

xiaojian001 · Oct 21, 2016 · b3538bc · b3538bc
1 parent 51398f4
commit b3538bc
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 20 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
     "author": "Ma Bingyao <[email protected]>",
     "name": "hprose",
-    "version": "2.0.15",
+    "version": "2.0.16",
     "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.15
+// Hprose for JavaScript v2.0.16
 // Copyright (c) 2008-2016 http://hprose.com
 // Hprose is freely distributable under the MIT license.
 // For all details and documentation:
@@ -1733,7 +1733,7 @@
  *                                                        *
  * hprose Future for JavaScript.                          *
  *                                                        *
- * LastModified: Sep 29, 2016                             *
+ * LastModified: Oct 21, 2016                             *
  * Author: Ma Bingyao <[email protected]>                  *
  *                                                        *
 \**********************************************************/
@@ -1782,7 +1782,7 @@
     }
 
     function toPromise(obj) {
-        return (isPromise(obj) ? obj : value(obj));
+        return (isFuture(obj) ? obj : value(obj));
     }
 
     function delayed(duration, value) {
@@ -2122,7 +2122,7 @@
                 this.reject(new TypeError('Self resolution'));
                 return;
             }
-            if (isPromise(value)) {
+            if (isFuture(value)) {
                 value.fill(this);
                 return;
             }

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.15",
+  "version": "2.0.16",
   "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.15
+// Hprose for JavaScript v2.0.16
 // 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
@@ -13,7 +13,7 @@
  *                                                        *
  * hprose Future for JavaScript.                          *
  *                                                        *
- * LastModified: Sep 29, 2016                             *
+ * LastModified: Oct 21, 2016                             *
  * Author: Ma Bingyao <[email protected]>                  *
  *                                                        *
 \**********************************************************/
@@ -62,7 +62,7 @@
     }
 
     function toPromise(obj) {
-        return (isPromise(obj) ? obj : value(obj));
+        return (isFuture(obj) ? obj : value(obj));
     }
 
     function delayed(duration, value) {
@@ -402,7 +402,7 @@
                 this.reject(new TypeError('Self resolution'));
                 return;
             }
-            if (isPromise(value)) {
+            if (isFuture(value)) {
                 value.fill(this);
                 return;
             }

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