svn commit: r1431124 - in /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb: assembler/classic/Assembler.java core/webservices/UriResolver.java util/URLs.java

[rmannibucau]

Author: rmannibucau
Date: Wed Jan  9 22:41:07 2013
New Revision: 1431124

URL: http://svn.apache.org/viewvc?rev=1431124&view=rev
Log:
only supporting space in uri avoid to break the whole server + small 
enhancement for resource success debug message

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/UriResolver.java
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1431124&r1=1431123&r2=1431124&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
 Wed Jan  9 22:41:07 2013
@@ -1918,7 +1918,9 @@ public class Assembler extends Assembler
         // Update the config tree
         config.facilities.resources.add(serviceInfo);
 
-        logger.getChildLogger("service").debug("createService.success", 
serviceInfo.service, serviceInfo.id, serviceInfo.className);
+        if (logger.isDebugEnabled()) { // weird to check parent logger but 
save time and it is almost never activated
+            logger.getChildLogger("service").debug("createService.success", 
serviceInfo.service, serviceInfo.id, serviceInfo.className);
+        }
     }
 
     private void bindResource(final String id, final Object service) throws 
OpenEJBException {

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/UriResolver.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/UriResolver.java?rev=1431124&r1=1431123&r2=1431124&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/UriResolver.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/core/webservices/UriResolver.java
 Wed Jan  9 22:41:07 2013
@@ -102,7 +102,7 @@ public class UriResolver {
         if (uriFile.exists()) {
             relative = uriFile.toURI();
         } else {
-            relative = URLs.uri(uriStr.replace(" ", "%20"));
+            relative = URLs.uri(uriStr);
         }
 
         if (relative.isAbsolute()) {

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java?rev=1431124&r1=1431123&r2=1431124&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/URLs.java
 Wed Jan  9 22:41:07 2013
@@ -17,17 +17,15 @@
 package org.apache.openejb.util;
 
 
-import static org.apache.openejb.loader.JarLocation.decode;
+import org.apache.xbean.finder.UrlSet;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
-import java.net.URLEncoder;
 
-import org.apache.xbean.finder.UrlSet;
+import static org.apache.openejb.loader.JarLocation.decode;
 
 
 /**
@@ -108,11 +106,7 @@ public class URLs {
     }
 
     public static URI uri(final String uri) {
-        try {
-            return URI.create(URLEncoder.encode(uri, "UTF-8"));
-        } catch (UnsupportedEncodingException e) {
-            return URI.create(URLEncoder.encode(uri)); // will not occur 
normally
-        }
+        return URI.create(uri.replace(" ", "%20"));
     }
 
     private URLs() { }