[jboss-cvs] JBossAS SVN: r83007 - projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers.

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

Author: ALRubinger
Date: 2009-01-17 19:10:22 -0500 (Sat, 17 Jan 2009)
New Revision: 83007

Modified:
   projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/PersistenceUnitDeployer.java
Log:
[EJBTHREE-1691] Fix an NPE

Modified: projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/PersistenceUnitDeployer.java
===================================================================
--- projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/PersistenceUnitDeployer.java	2009-01-18 00:02:17 UTC (rev 83006)
+++ projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/PersistenceUnitDeployer.java	2009-01-18 00:10:22 UTC (rev 83007)
@@ -22,6 +22,7 @@
 package org.jboss.jpa.deployers;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
@@ -68,7 +69,9 @@
       props.putAll(defaultPersistenceProperties);
       
       // Add properties from metadata
-      Map<String, String> metadataProps = metaData.getProperties();
+      Map<String, String> metadataProps = metaData.getProperties() != null
+            ? metaData.getProperties()
+            : new HashMap<String, String>();
       props.putAll(metadataProps);
       
       if (!props.containsKey("jboss.no.implicit.datasource.dependency"))