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 2012/01/21 16:53:45 UTC
svn commit: r1234351 -
/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java
Author: aadamchik
Date: Sat Jan 21 15:53:45 2012
New Revision: 1234351
URL: http://svn.apache.org/viewvc?rev=1234351&view=rev
Log:
CAY-1616 Remove internal dependencies on deprecated ObjectContext.localObject
cleaning up a single instance of old API use - the assertion is that we can simply look up an object
in the context cache; creating HOLLOW objects will be an overkill
Modified:
cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java
Modified: cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java?rev=1234351&r1=1234350&r2=1234351&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java (original)
+++ cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/main/java/org/apache/cayenne/ashwood/AshwoodEntitySorter.java Sat Jan 21 15:53:45 2012
@@ -269,10 +269,10 @@ public class AshwoodEntitySorter impleme
current);
if (masters[k] == null) {
- masters[k] = findReflexiveMaster(current, (ObjRelationship) objEntity
- .getRelationship(reflexiveRelName), current
- .getObjectId()
- .getEntityName());
+ masters[k] = findReflexiveMaster(
+ current,
+ (ObjRelationship) objEntity.getRelationship(reflexiveRelName),
+ current.getObjectId().getEntityName());
}
if (masters[k] != null) {
@@ -352,7 +352,11 @@ public class AshwoodEntitySorter impleme
DataRow snapshot = (DataRow) result.get(0);
ObjectId id = snapshot.createTargetObjectId(targetEntityName, finalRel);
- return (id != null) ? context.localObject(id, null) : null;
+
+ // not using 'localObject', looking up in context instead, as within the sorter
+ // we only care about objects participating in transaction, so no need to create
+ // hollow objects
+ return (id != null) ? context.getGraphManager().getNode(id) : null;
}
protected Comparator<DbEntity> getDbEntityComparator(boolean dependantFirst) {