geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1127119 - /geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
Date Tue, 24 May 2011 15:38:17 GMT
Author: genspring
Date: Tue May 24 15:38:17 2011
New Revision: 1127119

URL: http://svn.apache.org/viewvc?rev=1127119&view=rev
Log:
deprimitivize type when processing the resource type.

Modified:
    geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java

Modified: geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java?rev=1127119&r1=1127118&r2=1127119&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
(original)
+++ geronimo/server/trunk/plugins/j2ee/geronimo-naming-builder/src/main/java/org/apache/geronimo/naming/deployment/AbstractNamingBuilder.java
Tue May 24 15:38:17 2011
@@ -377,6 +377,7 @@ public abstract class AbstractNamingBuil
     
     private static Class<?> chooseType(String name, Class<?> originalType, Class<?>
alternativeType) throws DeploymentException{
         alternativeType = deprimitivize(alternativeType);
+        originalType = deprimitivize(originalType);
         if (originalType == null) {
             return alternativeType;
         } else if (!alternativeType.equals(originalType)) {
@@ -449,7 +450,7 @@ public abstract class AbstractNamingBuil
         } while (clazz != null);
         
         if (type != null) {
-            return type;
+            return deprimitivize(type);
         }
         
         throw new NoSuchFieldException(fieldName);



Mime
View raw message