diff options
author | Joe George <joe@zeroc.com> | 2014-10-16 10:42:27 -0400 |
---|---|---|
committer | Joe George <joe@zeroc.com> | 2014-10-16 10:44:27 -0400 |
commit | bffcb9b4b148ec06d35c123648b030df1ac28d11 (patch) | |
tree | 714fc6eff8656650e32151b43f298fe950dd3daa /js | |
parent | Windows installers updates (diff) | |
download | ice-bffcb9b4b148ec06d35c123648b030df1ac28d11.tar.bz2 ice-bffcb9b4b148ec06d35c123648b030df1ac28d11.tar.xz ice-bffcb9b4b148ec06d35c123648b030df1ac28d11.zip |
Fix bogus call to UUID.generateUUID in IceJS
Diffstat (limited to 'js')
-rw-r--r-- | js/src/Ice/Communicator.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/js/src/Ice/Communicator.js b/js/src/Ice/Communicator.js index 1cefa263f6e..707ea1ac2e8 100644 --- a/js/src/Ice/Communicator.js +++ b/js/src/Ice/Communicator.js @@ -19,7 +19,6 @@ Ice.__M.require(module, var Instance = Ice.Instance; var Promise = Ice.Promise; -var UUID = Ice.UUID; // // Ice.Communicator @@ -87,7 +86,7 @@ var Communicator = Ice.Class({ { if(name.length === 0) { - name = UUID.generateUUID(); + name = Ice.generateUUID(); } this.getProperties().setProperty(name + ".Endpoints", endpoints); @@ -99,11 +98,11 @@ var Communicator = Ice.Class({ { if(name.length === 0) { - name = UUID.generateUUID(); + name = Ice.generateUUID(); } var promise = new Ice.AsyncResultBase(this, "createObjectAdapterWithRouter", this, null, null); - + // // We set the proxy properties here, although we still use the proxy supplied. // @@ -112,7 +111,7 @@ var Communicator = Ice.Class({ { this.getProperties().setProperty(e.key, e.value); } - + this._instance.objectAdapterFactory().createObjectAdapter(name, router, promise); return promise; }, |