Author: dwoods
Date: Tue Oct 12 19:22:58 2010
New Revision: 1021890
URL: http://svn.apache.org/viewvc?rev=1021890&view=rev
Log:
testcase helper improvement to handle null props
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java?rev=1021890&r1=1021889&r2=1021890&view=diff
==============================================================================
---
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java
(original)
+++
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/test/AbstractPersistenceTestCase.java
Tue Oct 12 19:22:58 2010
@@ -132,7 +132,8 @@ public abstract class AbstractPersistenc
String res, Map<String,Object> props) {
OpenJPAEntityManagerFactorySPI oemf = null;
Map<Object, Object> config = new HashMap<Object,
Object>(System.getProperties());
- config.putAll(props);
+ if (props != null)
+ config.putAll(props);
oemf = (OpenJPAEntityManagerFactorySPI)
OpenJPAPersistence.createEntityManagerFactory(pu, res, props);
if (oemf == null) {
throw new NullPointerException("Expected an OpenJPA entity manager
factory " +
