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

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

Author: ALRubinger
Date: 2009-01-10 05:59:57 -0500 (Sat, 10 Jan 2009)
New Revision: 82750

Modified:
   projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/PersistenceUnitDeployer.java
Log:
[EJBTHREE-1674] When iterating through properties, use both the default and those from the PU Metadata

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-10 09:39:47 UTC (rev 82749)
+++ projects/jpa/trunk/deployers/src/main/java/org/jboss/jpa/deployers/PersistenceUnitDeployer.java	2009-01-10 10:59:57 UTC (rev 82750)
@@ -23,6 +23,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
@@ -62,7 +63,13 @@
 
    private void addDependencies(BeanMetaDataBuilder builder, PersistenceUnitMetaData metaData)
    {
+      // Initialize properties to default
       Properties props = defaultPersistenceProperties;
+      
+      // Add properties from metadata
+      Map<String, String> metadataProps = metaData.getProperties();
+      props.putAll(metadataProps);
+      
       if (!props.containsKey("jboss.no.implicit.datasource.dependency"))
       {
          if (metaData.getJtaDataSource() != null)