[jboss-cvs] JBossAS SVN: r110946 - projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge.

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

Author: jeff.zhang
Date: 2011-03-18 04:42:27 -0400 (Fri, 18 Mar 2011)
New Revision: 110946

Modified:
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge/Merger.java
Log:
[JBJCA-528] correct ConfigProperty merging about ConfigProperty16Impl

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge/Merger.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge/Merger.java	2011-03-18 04:10:19 UTC (rev 110945)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge/Merger.java	2011-03-18 08:42:27 UTC (rev 110946)
@@ -89,13 +89,13 @@
       {
          if (ijProperties != null && ijProperties.containsKey(c.getConfigPropertyName().getValue()))
          {
-            if (original instanceof ConfigProperty16)
+            if (c instanceof ConfigProperty16)
             {
                ConfigProperty16 c16 = (ConfigProperty16) c;
                XsdString newValue = new XsdString(ijProperties.get(c.getConfigPropertyName().getValue()), c
                   .getConfigPropertyName().getId());
                ConfigProperty16 newProp = new ConfigProperty16Impl(c.getDescriptions(), c.getConfigPropertyName(),
-                                                                   c.getConfigPropertyName(), newValue,
+                                                                   c.getConfigPropertyType(), newValue,
                                                                    c16.getConfigPropertyIgnore(),
                                                                    c16.getConfigPropertySupportsDynamicUpdates(),
                                                                    c16.getConfigPropertyConfidential(), c.getId());