AS7-4507 Use IPv6-safe URL syntax

jbossas · Apr 13, 2012 · d3fb1ce · d3fb1ce
1 parent bf9bf82
commit d3fb1ce
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/jacorb/pom.xml b/jacorb/pom.xml
@@ -96,6 +96,11 @@
             <artifactId>jboss-as-naming</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.jboss.as</groupId>
+            <artifactId>jboss-as-network</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.jboss.jbossts</groupId>
             <artifactId>jbossjts</artifactId>

diff --git a/jacorb/src/main/java/org/jboss/as/jacorb/service/CorbaORBService.java b/jacorb/src/main/java/org/jboss/as/jacorb/service/CorbaORBService.java
@@ -23,11 +23,13 @@
 package org.jboss.as.jacorb.service;
 
 import java.net.InetSocketAddress;
+import java.net.URL;
 import java.util.Properties;
 
 import org.jboss.as.jacorb.JacORBLogger;
 import org.jboss.as.jacorb.JacORBSubsystemConstants;
 import org.jboss.as.jacorb.naming.jndi.CorbaUtils;
+import org.jboss.as.network.NetworkUtils;
 import org.jboss.as.network.SocketBinding;
 import org.jboss.as.server.CurrentServiceContainer;
 import org.jboss.msc.inject.Injector;
@@ -102,7 +104,7 @@ public void start(StartContext context) throws StartException {
             String host = properties.getProperty(JacORBSubsystemConstants.ORB_ADDRESS);
             String port = properties.getProperty(JacORBSubsystemConstants.ORB_PORT);
             properties.setProperty(JacORBSubsystemConstants.JACORB_NAME_SERVICE_INIT_REF,
-                    "corbaloc::" + host + ":" + port + "/" + rootContext);
+                    "corbaloc::" + NetworkUtils.formatPossibleIpv6Address(host) + ":" + port + "/" + rootContext);
 
             // export the naming service corbaloc if necessary.
             String exportCorbalocProperty = properties.getProperty(JacORBSubsystemConstants.NAMING_EXPORT_CORBALOC, "on");