You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2006/11/06 02:49:10 UTC
svn commit: r471606 -
/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java
Author: aadamchik
Date: Sun Nov 5 17:49:07 2006
New Revision: 471606
URL: http://svn.apache.org/viewvc?view=rev&rev=471606
Log:
CAY-701: property" package refactoring
(getting rid of "injectValueHolders" calls as value holders are resolved on demand anyways)
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java
Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java
URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java?view=diff&rev=471606&r1=471605&r2=471606
==============================================================================
--- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java (original)
+++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/main/java/org/apache/cayenne/CayenneContext.java Sun Nov 5 17:49:07 2006
@@ -379,7 +379,6 @@
&& cachedObject.getPersistenceState() != PersistenceState.MODIFIED
&& cachedObject.getPersistenceState() != PersistenceState.DELETED) {
- descriptor.injectValueHolders(cachedObject);
if (prototype != null
&& ((Persistent) prototype).getPersistenceState() != PersistenceState.HOLLOW) {
@@ -413,7 +412,6 @@
if (prototype != null) {
localObject.setPersistenceState(PersistenceState.COMMITTED);
- descriptor.injectValueHolders(localObject);
descriptor.shallowMerge(prototype, localObject);
}
else {
@@ -490,7 +488,7 @@
object.setObjectId(id);
graphManager.registerNode(id, object);
-
+
return object;
}
}