[jboss-cvs] JBossAS SVN: r108664 - projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal.

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

Author: jesper.pedersen
Date: 2010-10-19 13:00:15 -0400 (Tue, 19 Oct 2010)
New Revision: 108664

Modified:
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java
Log:
Don't inject ignored properties

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java	2010-10-19 16:58:10 UTC (rev 108663)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java	2010-10-19 17:00:15 UTC (rev 108664)
@@ -130,8 +130,22 @@
             for (ConfigProperty cpmd : configs)
             {
                if (cpmd.isValueSet())
-                  injector.inject(cpmd.getConfigPropertyType().getValue(), cpmd.getConfigPropertyName().getValue(),
-                     cpmd.getConfigPropertyValue().getValue(), o);
+               {
+                  boolean setValue = true;
+
+                  if (cpmd instanceof org.jboss.jca.common.api.metadata.ra.ra16.ConfigProperty16)
+                  {
+                     org.jboss.jca.common.api.metadata.ra.ra16.ConfigProperty16 cpmd16 =
+                        (org.jboss.jca.common.api.metadata.ra.ra16.ConfigProperty16)cpmd;
+
+                     if (cpmd16.getConfigPropertyIgnore() != null && cpmd16.getConfigPropertyIgnore().booleanValue())
+                        setValue = false;
+                  }
+
+                  if (setValue)
+                     injector.inject(cpmd.getConfigPropertyType().getValue(), cpmd.getConfigPropertyName().getValue(),
+                                     cpmd.getConfigPropertyValue().getValue(), o);
+               }
             }
          }