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

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

Author: jesper.pedersen
Date: 2010-01-03 10:43:09 -0500 (Sun, 03 Jan 2010)
New Revision: 98968

Modified:
   projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/deployment/Unmarshaller.java
   projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java
Log:
Dont add empty strings to property content

Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/deployment/Unmarshaller.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/deployment/Unmarshaller.java	2010-01-03 13:48:39 UTC (rev 98967)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/deployment/Unmarshaller.java	2010-01-03 15:43:09 UTC (rev 98968)
@@ -340,7 +340,8 @@
                break;
 
             case XMLStreamReader.CHARACTERS :
-               result.getContent().add(xmlStreamReader.getText());
+               if (!xmlStreamReader.getText().trim().equals(""))
+                  result.getContent().add(xmlStreamReader.getText());
 
                break;
 
@@ -387,7 +388,6 @@
          {
             case XMLStreamReader.CHARACTERS :
                result.setValue(xmlStreamReader.getText());
-
                break;
 
             default :
@@ -420,7 +420,6 @@
          {
             case XMLStreamReader.CHARACTERS :
                result.setValue(xmlStreamReader.getText());
-
                break;
 
             default :
@@ -710,7 +709,6 @@
          {
             case XMLStreamReader.CHARACTERS :
                result.setValue(xmlStreamReader.getText());
-
                break;
 
             default :
@@ -743,7 +741,6 @@
          {
             case XMLStreamReader.CHARACTERS :
                result.setValue(xmlStreamReader.getText());
-
                break;
 
             default :

Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java	2010-01-03 13:48:39 UTC (rev 98967)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java	2010-01-03 15:43:09 UTC (rev 98968)
@@ -368,27 +368,31 @@
          else
          {
             ConstructorType ct = bt.getConstructor();
-            Object factoryObject = null;
-            Method factoryMethod = null;
-            Object[] args = null;
 
             if (ct.getParameter().size() == 0 && ct.getFactory() == null)
             {
                Class factoryClass = Class.forName(ct.getFactoryClass(), true, cl);
-               factoryMethod = factoryClass.getMethod(ct.getFactoryMethod(), (Class[])null);
+               Method factoryMethod = factoryClass.getMethod(ct.getFactoryMethod(), (Class[])null);
+               
+               instance = factoryMethod.invoke((Object)null, (Object[])null);
+               clz = instance.getClass();
             }
             else if (ct.getParameter().size() == 0 && ct.getFactory() != null)
             {
-               factoryObject = kernel.getBean(ct.getFactory().getBean());
-               factoryMethod = factoryObject.getClass().getMethod(ct.getFactoryMethod(), (Class[])null);
+               Object factoryObject = kernel.getBean(ct.getFactory().getBean());
+               Method factoryMethod = factoryObject.getClass().getMethod(ct.getFactoryMethod(), (Class[])null);
+
+               instance = factoryMethod.invoke(factoryObject, (Object[])null);
+               clz = instance.getClass();
             }
             else
             {
-               if (bt.getClazz() != null)
+               if (bt.getClazz() != null && ct.getFactoryClass() == null)
                {
                   clz = Class.forName(bt.getClazz(), true, cl);
                   Constructor[] constructors = clz.getConstructors();
                   Constructor constructor = null;
+                  Object[] args = null;
 
                   List<Constructor> candidates = new ArrayList<Constructor>();
 
@@ -466,6 +470,8 @@
                {
                   Class factoryClass = Class.forName(ct.getFactoryClass(), true, cl);
                   Method[] factoryMethods = factoryClass.getMethods();
+                  Method factoryMethod = null;
+                  Object[] args = null;
 
                   List<Method> candidates = new ArrayList<Method>();
 
@@ -540,7 +546,7 @@
                      }
                   }
 
-                  instance = factoryMethod.invoke(factoryObject, args);
+                  instance = factoryMethod.invoke((Object)null, args);
                   clz = instance.getClass();
                }
             }
@@ -866,10 +872,6 @@
             parameterValue = getValue((String)element, parameterClass, cl);
          }
 
-         if (parameterValue == null)
-            throw new Exception("No parameter value assigned for class " + parameterClass.getName() + 
-                                " value " + element);
-
          m.invoke(instance, parameterValue);
       }