You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by ss...@apache.org on 2006/12/22 21:38:01 UTC
svn commit: r489750 -
/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java
Author: ssegu
Date: Fri Dec 22 12:38:01 2006
New Revision: 489750
URL: http://svn.apache.org/viewvc?view=rev&rev=489750
Log:
Reset the SM to the old value, instead of nulling out.
Modified:
incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java
Modified: incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java
URL: http://svn.apache.org/viewvc/incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java?view=diff&rev=489750&r1=489749&r2=489750
==============================================================================
--- incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java (original)
+++ incubator/openjpa/trunk/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionAttachStrategy.java Fri Dec 22 12:38:01 2006
@@ -119,6 +119,7 @@
// assign the detached pc the same state manager as the object we're
// copying into during the attach process
+ StateManager smBefore = pc.pcGetStateManager();
pc.pcReplaceStateManager(sm);
int detach = (isNew) ? DETACH_ALL : broker.getDetachState();
FetchConfiguration fetch = broker.getFetchConfiguration();
@@ -139,7 +140,7 @@
}
}
} finally {
- pc.pcReplaceStateManager(null);
+ pc.pcReplaceStateManager(smBefore);
}
if (!embedded && !isNew)
compareVersion(sm, pc);