You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2009/07/13 06:40:40 UTC

svn commit: r793450 - /geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java

Author: xuhaihong
Date: Mon Jul 13 04:40:40 2009
New Revision: 793450

URL: http://svn.apache.org/viewvc?rev=793450&view=rev
Log:
GERONIMO-4217 Check for all data primitive types when shortcutting to the primordial classloader (Patch from Rex Wang)

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

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java?rev=793450&r1=793449&r2=793450&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/config/MultiParentClassLoader.java Mon Jul 13 04:40:40 2009
@@ -284,7 +284,11 @@
                 name.equals("boolean") ||
                 name.equals("int") ||
                 name.equals("double") ||
-                name.equals("long")) {
+                name.equals("long") ||
+                name.equals("short") ||
+                name.equals("float") ||
+                name.equals("byte") ||
+                name.equals("char")) {
             Class clazz = ClassLoader.getSystemClassLoader().loadClass(name);
             return resolveClass(clazz, resolve);
         }
@@ -365,7 +369,11 @@
                 name.equals("boolean") ||
                 name.equals("int") ||
                 name.equals("double") ||
-                name.equals("long")) {
+                name.equals("long") ||
+                name.equals("short") ||
+                name.equals("float") ||
+                name.equals("byte") ||
+                name.equals("char")) {
             try {
         	    return resolveClass(findSystemClass(name), resolve);
             } catch (ClassNotFoundException cnfe) {