commit ce088c16daacbd2bbdc59cd6809bd2be15b57055
author Polina Genova <p.genova@sap.com> Sun Feb 24 23:48:07 2013 +0200
committer Violeta Georgieva <milesg78@gmail.com> Sun Feb 24 23:48:07 2013 +0200
tree 1831854827883b345317e3e401f37b08e1c65e6e
parent 0a9c0dff319aa31e16ee0bc84dc65238a9287e66

bug 400080: Fix the incorrect construction of URL in org.apache.openejb.config.AutoConfig.

hotfix/source/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java

diff --git a/hotfix/source/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java b/hotfix/source/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
index 23648cc..058d657 100755
--- a/hotfix/source/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
+++ b/hotfix/source/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
@@ -89,6 +89,7 @@
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
+import java.net.URLEncoder;
 
 import static java.util.Arrays.asList;
 import static org.apache.openejb.config.ServiceUtils.ANY;
@@ -219,12 +220,12 @@
         }
 
         for (ClientModule clientModule : appModule.getClientModules()) {
-            URI moduleURI = URI.create(clientModule.getModuleId());
+            URI moduleURI = URI.create(URLEncoder.encode(clientModule.getModuleId()));
             processPersistenceRefs(clientModule.getApplicationClient(), clientModule, persistenceUnits, moduleURI);
         }
 
         for (WebModule webModule : appModule.getWebModules()) {
-            URI moduleURI = URI.create(webModule.getModuleId());
+            URI moduleURI = URI.create(URLEncoder.encode(webModule.getModuleId()));
             processPersistenceRefs(webModule.getWebApp(), webModule, persistenceUnits, moduleURI);
         }
     }
@@ -575,7 +576,7 @@
         }
 
         for (WebModule webModule : appModule.getWebModules()) {
-            URI moduleUri = URI.create(webModule.getModuleId());
+            URI moduleUri = URI.create(URLEncoder.encode(webModule.getModuleId()));
             for (MessageDestinationRef ref : webModule.getWebApp().getMessageDestinationRef()) {
                 String destinationId = resolveDestinationId(ref, moduleUri, destinationResolver, destinationTypes);
                 if (destinationId != null) {
@@ -594,7 +595,7 @@
                 continue;
             }
 
-            URI moduleUri = URI.create(ejbModule.getModuleId());
+            URI moduleUri = URI.create(URLEncoder.encode(ejbModule.getModuleId()));
             OpenejbJar openejbJar = ejbModule.getOpenejbJar();
 
             for (EnterpriseBean bean : ejbModule.getEjbJar().getEnterpriseBeans()) {