db-jdo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m..@apache.org
Subject svn commit: r220100 - /incubator/jdo/trunk/runtime20/src/java/org/apache/jdo/impl/state/StateManagerImpl.java
Date Thu, 21 Jul 2005 14:46:32 GMT
Author: mbo
Date: Thu Jul 21 07:46:31 2005
New Revision: 220100

URL: http://svn.apache.org/viewcvs?rev=220100&view=rev
Log:
Added method clearLoadedFields that marks all non-pk fields as not loaded

Modified:
    incubator/jdo/trunk/runtime20/src/java/org/apache/jdo/impl/state/StateManagerImpl.java

Modified: incubator/jdo/trunk/runtime20/src/java/org/apache/jdo/impl/state/StateManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/jdo/trunk/runtime20/src/java/org/apache/jdo/impl/state/StateManagerImpl.java?rev=220100&r1=220099&r2=220100&view=diff
==============================================================================
--- incubator/jdo/trunk/runtime20/src/java/org/apache/jdo/impl/state/StateManagerImpl.java
(original)
+++ incubator/jdo/trunk/runtime20/src/java/org/apache/jdo/impl/state/StateManagerImpl.java
Thu Jul 21 07:46:31 2005
@@ -18,7 +18,6 @@
  * StateManagerImpl.java
  *
  * Created on September 1, 2000, 2:29 PM
- * @version 1.0.1
  */
 
 package org.apache.jdo.impl.state;
@@ -54,7 +53,7 @@
  * requests to LifeCycleState.
  *
  * @author  Marina Vatkina
- * @version 1.0.1
+ * @version 2.0
  */
 class StateManagerImpl implements StateManagerInternal {
 
@@ -317,6 +316,15 @@
         }
     }
 
+    /** Clears the loaded field bits and marks only the key fields, if
+     * any, as loaded.  Note: The key fields must always be marked as
+     * loaded for Application Identity.
+     */
+    private void clearLoadedFields() {
+        loadedFields.andNot(loadedFields);
+        markPKFieldsAsLoaded();
+    }
+
     //
     // ------------ State transition methods ------------
     //
@@ -671,14 +679,14 @@
      * Returns <code>true</code>, if a before image must be created. The
      * decision is based on the current lifecycle state plus other conditions
      * e.g. transaction type, restore values flag, etc.
-     * @see org.apache.jdo.state.StateManagerInternal#isBeforeImageRequired()
+     * @see org.apache.jdo.state.StateManagerInternal#isBeforeImageRequired ()
      * @return <code>true</code> if a before image must be created.
      */
     public boolean isBeforeImageRequired() {
-        boolean isTransientTransactional = 
+        boolean isTransientTransactional =
             !myLC.isPersistent() && myLC.isTransactional();
         return (tx.getOptimistic() || tx.getRestoreValues() ||
-                isTransientTransactional);
+            isTransientTransactional);
     }
 
     //
@@ -790,8 +798,8 @@
         myPC.jdoReplaceFields(jdoClass.getPersistentNonPrimaryKeyFieldNumbers());
         expectedProvider = null; // No expected request.
 
-        loadedFields.andNot(loadedFields);
-        markPKFieldsAsLoaded();
+        // Mark only the key fields as loaded for Application Identity
+        clearLoadedFields();
     }
 
     /** Disconnect StateManager and PC. Called by LifeCycle when
@@ -839,7 +847,9 @@
             // until fetch.
             resetDirtyFields();
             fields = getFieldNums(loadedFields);
-            loadedFields.andNot(loadedFields);
+
+            // Mark only the key fields as loaded for Application Identity
+            clearLoadedFields();
         }
 
         fetch (myPM.getStoreManager(), fields);
@@ -985,9 +995,9 @@
                 } else {
                     try {
                         java.lang.reflect.Method m = 
-                            o.getClass().getMethod("clone", null); // NOI18N
+                            o.getClass().getMethod("clone", (Class[]) null); // NOI18N
                         if (m != null) {
-                            clone = m.invoke(o, null);
+                            clone = m.invoke(o, (Object[]) null);
                         }
                     } catch (Exception e) {
                         throw new JDOFatalInternalException(
@@ -1495,7 +1505,7 @@
             myPC = jdoImplHelper.newInstance (myPCClass, this, objectId);
         }
         markPKFieldsAsLoaded();
-    }	
+    }
 
     /**
     * Helper method to define the list of fields to be loaded



Mime
View raw message