[jboss-cvs] JBossAS SVN: r88154 - branches/Branch_5_x/connector/src/main/org/jboss/resource/connectionmanager.

[jboss-cvs-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2009-05-04 11:24:07 -0400 (Mon, 04 May 2009)
New Revision: 88154

Modified:
   branches/Branch_5_x/connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java
Log:
rollback JBAS-6860

Modified: branches/Branch_5_x/connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java
===================================================================
--- branches/Branch_5_x/connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java	2009-05-04 15:04:35 UTC (rev 88153)
+++ branches/Branch_5_x/connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java	2009-05-04 15:24:07 UTC (rev 88154)
@@ -395,37 +395,21 @@
       String setterName = "set" + Character.toUpperCase(name.charAt(0));
       if (name.length() > 1)
          setterName = setterName.concat(name.substring(1));
-      Method setter = null;
+      Method setter;
       try
       {
          setter = mcfClass.getMethod(setterName, new Class[] {clazz});
       }
       catch (NoSuchMethodException nsme)
       {
-         // if it's a primitive then try its wrapper type,
-         // if it's a primitive wrapper then try the primitive type
-         try
+         String error = "The class '" + mcfClass.toString() + "' has no setter for config property '" + name + "'"; 
+         if (mustExist)
+            throw new IllegalArgumentException(error);
+         else
          {
-            if(clazz.isPrimitive())
-               setter = mcfClass.getMethod(setterName, new Class[] {Classes.getPrimitiveWrapper(clazz)});
-            else if(Classes.isPrimitiveWrapper(clazz))
-               setter = mcfClass.getMethod(setterName, new Class[] {Classes.getPrimitive(clazz)});
+            log.trace(error, nsme);
+            return;
          }
-         catch(NoSuchMethodException nsme2)
-         {
-         }
-         
-         if(setter == null)
-         {
-            String error = "The class '" + mcfClass.toString() + "' has no setter for config property '" + name + "'"; 
-            if (mustExist)
-               throw new IllegalArgumentException(error);
-            else
-            {
-               log.trace(error, nsme);
-               return;
-            }
-         }
       }
       try
       {