[jboss-cvs] JBossAS SVN: r105025 - in projects/jboss-jca/trunk: deployers/src/main/java/org/jboss/jca/deployers/fungal and 1 other directory.

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

Author: jesper.pedersen
Date: 2010-05-20 03:19:15 -0400 (Thu, 20 May 2010)
New Revision: 105025

Modified:
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/Annotations.java
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
Log:
[JBJCA-335] Only inject value if @ConfigProperty::defaultValue is set

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/Annotations.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/Annotations.java	2010-05-20 07:17:12 UTC (rev 105024)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/Annotations.java	2010-05-20 07:19:15 UTC (rev 105025)
@@ -637,7 +637,10 @@
 
       ConfigPropertyMetaData cfgMeta = new ConfigPropertyMetaData();
       cfgMeta.setName(getConfigPropertyName(annotation));
-      cfgMeta.setValue(configProperty.defaultValue());
+
+      if (configProperty.defaultValue() != null && !configProperty.defaultValue().equals(""))
+         cfgMeta.setValue(configProperty.defaultValue());
+
       if (!Object.class.equals(configProperty.type()))
       {
          cfgMeta.setType(configProperty.type().getName());

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java	2010-05-20 07:17:12 UTC (rev 105024)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java	2010-05-20 07:19:15 UTC (rev 105025)
@@ -906,7 +906,8 @@
             Injection injector = new Injection();
             for (ConfigPropertyMetaData cpmd : configs)
             {
-               injector.inject(cpmd.getType(), cpmd.getName(), cpmd.getValue(), o);
+               if (cpmd.isValueSet())
+                  injector.inject(cpmd.getType(), cpmd.getName(), cpmd.getValue(), o);
             }
          }