Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-1904 Propagate refresh operation for eagerly fetched relationship fields. 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.1.x@1044005 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Albert Lee 2010-12-09 15:33:06 +00:00
parent 0a087b2679
commit 8cf5f35488
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
View File

@ -3011,7 +3011,7 @@ public class BrokerImpl
}
int level = _fc.getReadLockLevel();
int timeout = _fc.getLockTimeout();
_lm.lock(sm, level, timeout, null, false);
_lm.refreshLock(sm, level, timeout, null);
sm.readLocked(level, level);
} else if (assertPersistenceCapable(obj).pcIsDetached()
== Boolean.TRUE)
@ -3083,7 +3083,7 @@ public class BrokerImpl
}
int level = _fc.getReadLockLevel();
int timeout = _fc.getLockTimeout();
_lm.lock(sm, level, timeout, null, false);
_lm.refreshLock(sm, level, timeout, null);
sm.readLocked(level, level);
fireLifecycleEvent(sm.getManagedInstance(), null,
sm.getMetaData(), LifecycleEvent.AFTER_REFRESH);

4
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/LockManager.java
View File

@ -74,8 +74,8 @@ public interface LockManager
* Perform the same function as previous lock method and has the option
* to perform a version check after the lock function has completed.
*/
public void lock(OpenJPAStateManager sm, int level, int timeout,
Object sdata, boolean postLockVersionCheck);
public void refreshLock(OpenJPAStateManager sm, int level, int timeout,
Object sdata);
/**
* Obtain locks on the specified objects.

4
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/NoneLockManager.java
View File

@ -33,8 +33,8 @@ public class NoneLockManager
sm.setLock(Boolean.TRUE);
}
public void lock(OpenJPAStateManager sm, int level, int timeout,
Object context, boolean postLockVersionCheck) {
public void refreshLock(OpenJPAStateManager sm, int level, int timeout,
Object context) {
sm.setLock(Boolean.TRUE);
}

15
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/VersionLockManager.java
View File

@ -31,6 +31,7 @@ public class VersionLockManager
private boolean _versionCheckOnReadLock = true;
private boolean _versionUpdateOnWriteLock = true;
private boolean _refreshing = false;
/**
* Returns the given instance's lock level, assuming that the state's
@ -67,10 +68,20 @@ public class VersionLockManager
*/
public void lock(OpenJPAStateManager sm, int level, int timeout,
Object sdata) {
lock(sm, level, timeout, sdata, true);
commonLock(sm, level, timeout, sdata, !_refreshing);
}
public void lock(OpenJPAStateManager sm, int level, int timeout,
public void refreshLock(OpenJPAStateManager sm, int level, int timeout,
Object sdata) {
try {
_refreshing = true;
commonLock(sm, level, timeout, sdata, false);
} finally {
_refreshing = false;
}
}
private void commonLock(OpenJPAStateManager sm, int level, int timeout,
Object sdata, boolean postLockVersionCheck) {
if (level == LOCK_NONE)
return;