Author: tdraier
Date: Wed Sep 26 12:06:07 2007
New Revision: 18664
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18664&repname=
=3Djahia
Log:
correctly check locks (JAHIA-2350)
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/Contain=
erBean.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/Contain=
erListBean.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/C=
ontainerBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/beans/ContainerBean.java&rev=3D18664&r=
epname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/Contain=
erBean.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/Contain=
erBean.java Wed Sep 26 12:06:07 2007
@@ -565,8 +565,7 @@
curActionURIBean =3D new ActionURIBean("delete", curURL,
curLauncherURI);
lockKey =3D LockKey.composeLockKey(LockKey.DELETE_CONTAINE=
R_TYPE, jahiaContainer.getID());
- if (!lockRegistry.isAcquireable(lockKey, user,
- processingContext.getSessionID())) {
+ if (!lockRegistry.isAcquireable(lockKey, user, user.getUse=
rKey())) {
curActionURIBean.setLocked(true);
} else {
completelyLocked =3D false;
@@ -593,7 +592,7 @@
=
lockKey =3D LockKey.composeLockKey(LockKey.EXPORT_CONTAINER_TY=
PE, jahiaContainer.getID());
=
- if (!lockRegistry.isAcquireable(lockKey, user, processingConte=
xt.getSessionID())) {
+ if (!lockRegistry.isAcquireable(lockKey, user, user.getUserKey=
())) {
curActionURIBean.setLocked(true);
curActionURIBean.setLauncherUri("void");
} else {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/C=
ontainerListBean.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/data/beans/ContainerListBean.java&rev=3D186=
64&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/Contain=
erListBean.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/data/beans/Contain=
erListBean.java Wed Sep 26 12:06:07 2007
@@ -456,8 +456,7 @@
curLauncherURI =3D htmlToolBox.drawContainerListProperties=
Launcher(theList);
curActionURIBean =3D new ActionURIBean("update", curURL, c=
urLauncherURI);
lockKey =3D LockKey.composeLockKey(LockKey.UPDATE_CONTAINE=
RLIST_TYPE, jahiaContainerList.getID());
- if (!lockRegistry.isAcquireable(lockKey, user,
- processingContext.getSessionID())) {
+ if (!lockRegistry.isAcquireable(lockKey, user, user.getUse=
rKey())) {
curActionURIBean.setLocked(true);
} else {
completelyLocked =3D false;
@@ -504,8 +503,7 @@
curActionURIBean =3D new ActionURIBean("pa=
ste", "", buff.toString());
=
lockKey =3D LockKey.composeLockKey(LockKey=
.ADD_CONTAINER_TYPE, jahiaContainerList.getID());
- if (!lockRegistry.isAcquireable(lockKey, u=
ser,
- processingContext.getSessionID()))=
{
+ if (!lockRegistry.isAcquireable(lockKey, u=
ser, user.getUserKey())) {
curActionURIBean.setLocked(true);
curActionURIBean.setLauncherUri("void"=
);
} else {
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
