[jboss-cvs] JBossAS SVN: r58831 - in trunk/ejb3/src/main/org/jboss/ejb3: deployers metamodel

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

Author: wolfc
Date: 2006-12-04 06:48:50 -0500 (Mon, 04 Dec 2006)
New Revision: 58831

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java
   trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java
Log:
fixed NPE in DelegatingObjectModelFactory.newChild

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java	2006-12-04 11:37:46 UTC (rev 58830)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/JBossClientParsingDeployer.java	2006-12-04 11:48:50 UTC (rev 58831)
@@ -63,6 +63,10 @@
    @Override
    protected ObjectModelFactory getObjectModelFactory(ApplicationClientDD root)
    {
+      // if we haven't gotten an application-client.xml yet
+      if(root == null)
+         root = new ApplicationClientDD();
+      
       return new JBossClientDDObjectFactory(root);
    }
 

Modified: trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java	2006-12-04 11:37:46 UTC (rev 58830)
+++ trunk/ejb3/src/main/org/jboss/ejb3/metamodel/JBossClientDDObjectFactory.java	2006-12-04 11:48:50 UTC (rev 58831)
@@ -78,6 +78,10 @@
    
    public JBossClientDDObjectFactory(ApplicationClientDD dd)
    {
+      // JBossXB will otherwise fail later on
+      if(dd == null)
+         throw new NullPointerException("dd is null");
+      
       this.dd = dd;
    }