DataNucleus

Revision: 1740
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=1740&view=rev
Author:   andy_jefferson
Date:     2008-06-19 09:55:08 -0700 (Thu, 19 Jun 2008)

Log Message:
-----------
Add toString() so we have easy debug of what fields/version are cached

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/cache/CachedPC.java

Modified: platform/core/trunk/src/java/org/datanucleus/cache/CachedPC.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/cache/CachedPC.java	2008-06-19 13:20:59 UTC (rev 1739)
+++ platform/core/trunk/src/java/org/datanucleus/cache/CachedPC.java	2008-06-19 16:55:08 UTC (rev 1740)
@@ -17,6 +17,8 @@
 **********************************************************************/
 package org.datanucleus.cache;
 
+import org.datanucleus.util.StringUtils;
+
 /**
  * An object that is stored in the Level2 Cache.
  * Comprises a persistable object, its loaded fields array, and the version that was stored.
@@ -85,4 +87,15 @@
     {
         return loadedFields;
     }
+
+    /**
+     * Method to return a sting form of the cached object.
+     * Returns something like "CachedPC : org.datanucleus.test.A@... version=1 loadedFlags=[YY]"
+     * @return The string form
+     */
+    public String toString()
+    {
+        return "CachedPC : " + StringUtils.toJVMIDString(pc) + " version=" + version +
+            " loadedFlags=" + StringUtils.booleanArrayToString(loadedFields);
+    }
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 1739
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=1739&view=rev
Author:   andy_jefferson
Date:     2008-06-19 06:20:59 -0700 (Thu, 19 Jun 2008)

Log Message:
-----------
Remove 2 dup'd calls to jdoReplaceStateManager in the detach process - the SM was already being set in the initialiseForDetached method.

Modified Paths:
--------------
    platform/core/trunk/src/java/org/datanucleus/state/JDOStateManagerImpl.java

Modified: platform/core/trunk/src/java/org/datanucleus/state/JDOStateManagerImpl.java
===================================================================
--- platform/core/trunk/src/java/org/datanucleus/state/JDOStateManagerImpl.java	2008-06-18 11:04:04 UTC (rev 1738)
+++ platform/core/trunk/src/java/org/datanucleus/state/JDOStateManagerImpl.java	2008-06-19 13:20:59 UTC (rev 1739)
@@ -3653,7 +3653,6 @@
                 // Create a SM for our copy object
                 JDOStateManagerImpl smDetachedPC = new JDOStateManagerImpl(myOM, cmd);
                 smDetachedPC.initialiseForDetached(detachedPC, getExternalObjectId(myPC), getVersion(myPC));
-                detachedPC.jdoReplaceStateManager(smDetachedPC);
                 smDetachedPC.referencedPC = myPC;
 
                 smDetachedPC.replaceFields(getFieldsNumbersToDetach(), new DetachFieldManager(this, getSecondClassMutableFields(), 
@@ -3899,7 +3898,6 @@
             // Add a state manager to the detached PC so that we can retrieve its detached state
             JDOStateManagerImpl smDetachedPC = new JDOStateManagerImpl(myOM, cmd);
             smDetachedPC.initialiseForDetached(detachedPC, getExternalObjectId(detachedPC), null);
-            detachedPC.jdoReplaceStateManager(smDetachedPC);
 
             // Cross-reference the attached and detached objects for the attach process
             smDetachedPC.referencedPC = myPC;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.