svn commit: r923958 - in /openjpa/trunk: openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoProxy.java

[dwoods]

Author: dwoods
Date: Tue Mar 16 20:08:28 2010
New Revision: 923958

URL: http://svn.apache.org/viewvc?rev=923958&view=rev
Log:
OPENJPA-1097 Remove duplicate code in DetachManager and cleanup comments/traces 
in tests

Modified:
    
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java
    
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoProxy.java

Modified: 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java?rev=923958&r1=923957&r2=923958&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java
 (original)
+++ 
openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/DetachManager.java
 Tue Mar 16 20:08:28 2010
@@ -568,7 +568,6 @@ public class DetachManager
                             proxy.getChangeTracker().stopTracking();
                         proxy.setOwner(dsm, (dsm == null) ? -1 : 
fmd.getIndex());
                     }
-                    sm.provideField(getDetachedPersistenceCapable(), this, 
fmd.getIndex());
                 }
             }
             clear();

Modified: 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoProxy.java
URL: 
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoProxy.java?rev=923958&r1=923957&r2=923958&view=diff
==============================================================================
--- 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoProxy.java
 (original)
+++ 
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/detach/TestDetachNoProxy.java
 Tue Mar 16 20:08:28 2010
@@ -159,7 +159,7 @@ public class TestDetachNoProxy extends S
         em.detachAll(e20List.get(0), e20List.get(1), e20List.get(2));
         for (int i=0; i<numEntities; i++) {
             if (log.isTraceEnabled())
-                log.trace("** after EM.clear() verify Entity20(" + i + ")");
+                log.trace("** after EM.detachAll() verify e20List(" + i + ")");
             Entity20 e20 = e20List.get(i);
             // entity should not have any proxy classes (in-place updated) and 
is detached
             assertFalse(em.contains(e20));
@@ -171,7 +171,7 @@ public class TestDetachNoProxy extends S
     }
 
     /*
-     * Verify that after EM.clear() in-place detached entities do not contain 
any proxy classes.
+     * Verify that after EM.clear() entities still contain proxy classes.
      */
     public void testClear() {
         if (log.isTraceEnabled())
@@ -191,6 +191,7 @@ public class TestDetachNoProxy extends S
         }
 
         em.clear();
+
         for (int i=0; i<numEntities; i++) {
             if (log.isTraceEnabled())
                 log.trace("** after EM.clear() verify Entity20(" + i + ")");