svn commit: r1491006 - in /openjpa/trunk: openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUnitUtil.java openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java

[allee8285]

Author: allee8285
Date: Sat Jun  8 16:06:08 2013
New Revision: 1491006

URL: http://svn.apache.org/r1491006
Log:
OPENJPA-2379 - Revert changes due to following additional failures:
Failure         TestPersistenceUtil. testNotLoadedEager 
(org.apache.openjpa.persistence.util)   163ms View trend        1590
Failure         TestProviderUtil. testNotLoadedEager 
(org.apache.openjpa.persistence.util)      79ms View trend         1378
Failure         TestProviderUtil. testNotLoadedLazy 
(org.apache.openjpa.persistence.util)       61ms View trend         1376
Failure         TestProviderUtil. testIsApplicationLoaded 
(org.apache.openjpa.persistence.util)         37ms View trend         1379
Failure         TestPersistenceUtil. testNotLoadedLazy 
(org.apache.openjpa.persistence.util)    34ms View trend         1588
Failure         TestPersistenceUtil. testIsApplicationLoaded 
(org.apache.openjpa.persistence.util)      34ms View trend         1591

Modified:
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUnitUtil.java
    
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java

Modified: 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUnitUtil.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUnitUtil.java?rev=1491006&r1=1491005&r2=1491006&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUnitUtil.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/util/TestPersistenceUnitUtil.java
 Sat Jun  8 16:06:08 2013
@@ -53,11 +53,9 @@ public class TestPersistenceUnitUtil ext
     /*
      * Verifies an entity and its persistent attributes are in the proper 
      * not loaded state.
-     * 
-     * This test is retired, because lazy states <em>may</em> be loaded as 
well. 
      */
     public void testNotLoadedLazy() {
-//        verifyIsLoadedEagerState(false);       
+        verifyIsLoadedEagerState(false);       
     }
 
     /*
@@ -71,11 +69,9 @@ public class TestPersistenceUnitUtil ext
     /*
      * Verifies an entity and its persistent attributes are in the proper 
      * NOT_LOADED state.
-     * 
-     * Note: This test is retired.
      */
     public void testNotLoadedEager() {
-//        verifyIsLoadedEagerState(false);       
+        verifyIsLoadedEagerState(false);       
     }
     
     /**
@@ -237,7 +233,7 @@ public class TestPersistenceUnitUtil ext
         
         ee = em.getReference(EagerEntity.class, ee.getId());
         assertNotNull(ee);
-//        assertEagerLoadState(puu, ee, false);
+        assertEagerLoadState(puu, ee, false);
         
         ee.setName("AppEagerName");
         EagerEmbed emb = createEagerEmbed();

Modified: 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java?rev=1491006&r1=1491005&r2=1491006&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/OpenJPAPersistenceUtil.java
 Sat Jun  8 16:06:08 2013
@@ -197,8 +197,8 @@ public class OpenJPAPersistenceUtil {
         BitSet loadSet = sm.getLoaded();
                 
         // Simple load state check for the field
-        if (loadSet.get(fmd.getIndex()))
-            return true;
+        if (!loadSet.get(fmd.getIndex()))
+            return false;
 
         Object field = sm.fetchField(fmd.getIndex(), false);