[jboss-cvs] JBossAS SVN: r88152 - in branches/Branch_5_x/connector/src/main/org/jboss/resource: metadata/mcf and 1 other directory.

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

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

Modified:
   branches/Branch_5_x/connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java
   branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java
Log:
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 14:07:00 UTC (rev 88151)
+++ branches/Branch_5_x/connector/src/main/org/jboss/resource/connectionmanager/ManagedConnectionFactoryDeployment.java	2009-05-04 15:04:34 UTC (rev 88152)
@@ -395,21 +395,37 @@
       String setterName = "set" + Character.toUpperCase(name.charAt(0));
       if (name.length() > 1)
          setterName = setterName.concat(name.substring(1));
-      Method setter;
+      Method setter = null;
       try
       {
          setter = mcfClass.getMethod(setterName, new Class[] {clazz});
       }
       catch (NoSuchMethodException nsme)
       {
-         String error = "The class '" + mcfClass.toString() + "' has no setter for config property '" + name + "'"; 
-         if (mustExist)
-            throw new IllegalArgumentException(error);
-         else
+         // if it's a primitive then try its wrapper type,
+         // if it's a primitive wrapper then try the primitive type
+         try
          {
-            log.trace(error, nsme);
-            return;
+            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)});
          }
+         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
       {

Modified: branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java
===================================================================
--- branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java	2009-05-04 14:07:00 UTC (rev 88151)
+++ branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java	2009-05-04 15:04:34 UTC (rev 88152)
@@ -171,7 +171,17 @@
          property.setValue(getURLProperty());
          properties.add(property);
       }
-      
+   
+      if(getIsSameRMOverrideValue() != null)
+      {
+         property = new ManagedConnectionFactoryPropertyMetaData();
+         property.setName("IsSameRMOverrideValue");
+         property.setType("boolean");
+         property.setValue(String.valueOf(getIsSameRMOverrideValue()));
+         properties.add(property);         
+         System.out.println(">>> set " + property.getName() + " = " + property.getValue());
+      }
+
       return properties;
    }
 }