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/18 05:18:18 UTC

svn commit: r649354 - /geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java

Author: mcconne
Date: Thu Apr 17 20:18:16 2008
New Revision: 649354

URL: http://svn.apache.org/viewvc?rev=649354&view=rev
Log:
GERONIMO-3966 Fix to normalize codebase used by the RMI Classloader

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

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java?rev=649354&r1=649353&r2=649354&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java Thu Apr 17 20:18:16 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;
     }
 
     /**