You are viewing a plain text version of this content. The canonical link for it is here.

Posted to scm@geronimo.apache.org by mc...@apache.org on 2008/04/22 16:28:05 UTC

svn commit: r650533 - /geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java

Author: mcconne
Date: Tue Apr 22 07:27:58 2008
New Revision: 650533

URL: http://svn.apache.org/viewvc?rev=650533&view=rev
Log:
GERONIMO-3966 Propagate spaces fix to 2.1

Modified:
    geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java?rev=650533&r1=650532&r2=650533&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java (original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java Tue Apr 22 07:27:58 2008
@@ -92,7 +92,15 @@
             return codebase.toString();
         }
         
-        return delegate.getClassAnnotation(type);
+        String codebase = delegate.getClassAnnotation(type);
+        if (codebase != null) {
+            try {
+                codebase = getNormalizedCodebase( codebase );
+            }
+            catch (MalformedURLException ignore) {
+            }
+        }
+        return codebase;
     }
 
     /**