diff options
author | Jose <jose@zeroc.com> | 2014-10-24 19:33:32 +0200 |
---|---|---|
committer | Jose <jose@zeroc.com> | 2014-10-24 19:33:32 +0200 |
commit | 64b65007f5c55a250139e2bbd35eeba62e16b24b (patch) | |
tree | 4c4cfc433eb2c2e0c2083317718980fc69d6fceb /js | |
parent | Fixes to IceGridGUI build (diff) | |
download | ice-64b65007f5c55a250139e2bbd35eeba62e16b24b.tar.bz2 ice-64b65007f5c55a250139e2bbd35eeba62e16b24b.tar.xz ice-64b65007f5c55a250139e2bbd35eeba62e16b24b.zip |
New fix for (ICE-5784) - JS test/Ice/acm fails with --ipv6
* Use splitString
Diffstat (limited to 'js')
-rw-r--r-- | js/src/Ice/Address.js | 2 | ||||
-rw-r--r-- | js/src/Ice/EndpointFactoryManager.js | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/js/src/Ice/Address.js b/js/src/Ice/Address.js index a1dbcda5fde..5c140653909 100644 --- a/js/src/Ice/Address.js +++ b/js/src/Ice/Address.js @@ -11,7 +11,7 @@ var Ice = require("../Ice/ModuleRegistry").Ice; Ice.Address = function(host, port) { - this.host = host.indexOf('"') === 0 ? host.replace(/"/g, "") : host; + this.host = host; this.port = port; }; module.exports.Ice = Ice; diff --git a/js/src/Ice/EndpointFactoryManager.js b/js/src/Ice/EndpointFactoryManager.js index d10308bb459..288a4d886a3 100644 --- a/js/src/Ice/EndpointFactoryManager.js +++ b/js/src/Ice/EndpointFactoryManager.js @@ -11,6 +11,7 @@ var Ice = require("../Ice/ModuleRegistry").Ice; Ice.__M.require(module, [ "../Ice/Class", + "../Ice/StringUtil", "../Ice/BasicStream", "../Ice/Debug", "../Ice/OpaqueEndpointI", @@ -26,6 +27,7 @@ var BasicStream = Ice.BasicStream; var EndpointParseException = Ice.EndpointParseException; var OpaqueEndpointI = Ice.OpaqueEndpointI; var Protocol = Ice.Protocol; +var StringUtil = Ice.StringUtil; var EndpointFactoryManager = Ice.Class({ __init__: function(instance) @@ -61,7 +63,7 @@ var EndpointFactoryManager = Ice.Class({ throw new EndpointParseException("value has no non-whitespace characters"); } - var arr = s.split(/[ \t\n\r]+/); + var arr = StringUtil.splitString(s, " \t\n\r"); if(arr.length === 0) { throw new EndpointParseException("value has no non-whitespace characters"); |