[jboss-cvs] JBossAS SVN: r86271 - branches/Branch_5_x/connector/src/main/org/jboss/resource/deployers/management.

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

Author: emuckenhuber
Date: 2009-03-24 15:36:32 -0400 (Tue, 24 Mar 2009)
New Revision: 86271

Modified:
   branches/Branch_5_x/connector/src/main/org/jboss/resource/deployers/management/AbstractConnectionFactoryICF.java
Log:
[JBAS-6670], [JBAS-6669] fix the property.type handling

Modified: branches/Branch_5_x/connector/src/main/org/jboss/resource/deployers/management/AbstractConnectionFactoryICF.java
===================================================================
--- branches/Branch_5_x/connector/src/main/org/jboss/resource/deployers/management/AbstractConnectionFactoryICF.java	2009-03-24 18:40:58 UTC (rev 86270)
+++ branches/Branch_5_x/connector/src/main/org/jboss/resource/deployers/management/AbstractConnectionFactoryICF.java	2009-03-24 19:36:32 UTC (rev 86271)
@@ -75,7 +75,7 @@
                String name = prop.getName();               
                MetaValue svalue = SimpleValueSupport.wrap(prop.getValue());
                mapValue.put(name, svalue);
-               MetaValue stype = SimpleValueSupport.wrap(prop.getValue());
+               MetaValue stype = SimpleValueSupport.wrap(prop.getType());
                mapValue.put(name+".type", stype);
             }
          }
@@ -114,6 +114,10 @@
          List<ManagedConnectionFactoryPropertyMetaData> list = new ArrayList<ManagedConnectionFactoryPropertyMetaData>();
          for(String name : mapValue.getMetaType().keySet())
          {
+            // Ignore the type we've added before
+            if(name.endsWith(".type"))
+               continue;
+            
             ManagedConnectionFactoryPropertyMetaData prop = new ManagedConnectionFactoryPropertyMetaData();
             prop.setName(name);
             String svalue = (String) getMetaValueFactory().unwrap(mapValue.get(name));