[jboss-cvs] JBossAS SVN: r95905 - in projects/jpa/trunk/impl/src: test/java/org/jboss/jpa/impl/test/deployment and 1 other directory.

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

Author: wolfc
Date: 2009-11-02 02:53:08 -0500 (Mon, 02 Nov 2009)
New Revision: 95905

Modified:
   projects/jpa/trunk/impl/src/main/java/org/jboss/jpa/impl/deployment/PersistenceUnitInfoImpl.java
   projects/jpa/trunk/impl/src/test/java/org/jboss/jpa/impl/test/deployment/PersistenceUnitInfoImplTestCase.java
Log:
JBJPA-15 / JBAS-7417: fixed NPE when validation mode is unspecified

Modified: projects/jpa/trunk/impl/src/main/java/org/jboss/jpa/impl/deployment/PersistenceUnitInfoImpl.java
===================================================================
--- projects/jpa/trunk/impl/src/main/java/org/jboss/jpa/impl/deployment/PersistenceUnitInfoImpl.java	2009-11-02 07:01:13 UTC (rev 95904)
+++ projects/jpa/trunk/impl/src/main/java/org/jboss/jpa/impl/deployment/PersistenceUnitInfoImpl.java	2009-11-02 07:53:08 UTC (rev 95905)
@@ -155,6 +155,9 @@
 
    private ValidationMode convertToValidationMode(org.jboss.metadata.jpa.spec.ValidationMode validationMode)
    {
+      // JBJPA-15 / JBAS-7417: if no validation mode is specified return null
+      if(validationMode == null) return null;
+      
       switch (validationMode) {
          case AUTO:
             return ValidationMode.AUTO;
@@ -169,6 +172,7 @@
 
    private Caching convertToCaching(SharedCacheMode sharedCacheMode)
    {
+      // JBJPA-15: if no caching mode is specified return null
       if(sharedCacheMode == null) return null;
       
       switch (sharedCacheMode) {

Modified: projects/jpa/trunk/impl/src/test/java/org/jboss/jpa/impl/test/deployment/PersistenceUnitInfoImplTestCase.java
===================================================================
--- projects/jpa/trunk/impl/src/test/java/org/jboss/jpa/impl/test/deployment/PersistenceUnitInfoImplTestCase.java	2009-11-02 07:01:13 UTC (rev 95904)
+++ projects/jpa/trunk/impl/src/test/java/org/jboss/jpa/impl/test/deployment/PersistenceUnitInfoImplTestCase.java	2009-11-02 07:53:08 UTC (rev 95905)
@@ -70,4 +70,28 @@
       PersistenceUnitInfoImpl puii = new PersistenceUnitInfoImpl(metaData, props, classLoader, persistenceUnitRootUrl, jarFiles, ctx);
       assertNull(puii.getCaching());
    }
+
+   /**
+    * If I don't specify validation mode I don't want a NPE.
+    */
+   @Test
+   public void testUnspecifiedValidationMode() throws Exception
+   {
+      PersistenceUnitMetaData metaData = new PersistenceUnitMetaData();
+      metaData.setJtaDataSource("dummy-datasource");
+      metaData.setName("dummy-name");
+      Properties props = new Properties();
+      ClassLoader classLoader = null;
+      URL persistenceUnitRootUrl = null;
+      List<URL> jarFiles = new ArrayList<URL>();
+      Context ctx = new BrainlessContext() {
+         @Override
+         public Object lookup(String name) throws NamingException
+         {
+            return null;
+         }
+      };
+      PersistenceUnitInfoImpl puii = new PersistenceUnitInfoImpl(metaData, props, classLoader, persistenceUnitRootUrl, jarFiles, ctx);
+      assertNull(puii.getValidationMode());
+   }
 }