You are viewing a plain text version of this content. The canonical link for it is here.
Posted to slide-dev@jakarta.apache.org by oz...@apache.org on 2004/01/22 13:18:03 UTC
cvs commit: jakarta-slide/src/share/org/apache/slide/store ExtendedStore.java
ozeigermann 2004/01/22 04:18:03
Modified: src/share/org/apache/slide/store Tag:
SLIDE_2_0_RELEASE_BRANCH ExtendedStore.java
Log:
Locks and permissions were not included in a roll back as they had been
updated in a way not compliant with the tx cache. Fixed this...
Revision Changes Path
No revision
No revision
1.2.2.1 +18 -15 jakarta-slide/src/share/org/apache/slide/store/ExtendedStore.java
Index: ExtendedStore.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/share/org/apache/slide/store/ExtendedStore.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- ExtendedStore.java 17 Dec 2003 00:03:22 -0000 1.2
+++ ExtendedStore.java 22 Jan 2004 12:18:02 -0000 1.2.2.1
@@ -532,8 +532,9 @@
permissionsCache.put(uri.toString(), permissionsVector);
}
} else {
- Vector permissionsVector = (Vector) value;
+ Vector permissionsVector = new Vector((Vector) value);
permissionsVector.addElement(tempPermission);
+ permissionsCache.put(uri.toString(), permissionsVector);
}
} finally {
delist(this);
@@ -549,8 +550,9 @@
Object value = permissionsCache.get(uri.toString());
Vector permissionsVector = null;
if (value != null) {
- permissionsVector = (Vector) value;
+ permissionsVector = new Vector((Vector) value);
permissionsVector.removeElement(permission);
+ permissionsCache.put(uri.toString(), permissionsVector);
}
} finally {
delist(this);
@@ -565,10 +567,8 @@
enlist(this);
try {
Object value = permissionsCache.get(uri.toString());
- Vector permissionsVector = null;
if (value != null) {
- permissionsVector = (Vector) value;
- permissionsVector.removeAllElements();
+ permissionsCache.put(uri.toString(), new Vector());
}
} finally {
delist(this);
@@ -616,11 +616,11 @@
Vector locksVector = null;
if (value == null) {
locksVector = new Vector();
- locksCache.put(uri.toString(), locksVector);
} else {
- locksVector = (Vector) value;
+ locksVector = new Vector((Vector)value);
}
locksVector.addElement(lock.cloneObject());
+ locksCache.put(uri.toString(), locksVector);
} finally {
delist(this);
}
@@ -635,12 +635,13 @@
Object value = locksCache.get(uri.toString());
Vector locksVector = null;
if (value != null) {
- locksVector = (Vector) value;
+ locksVector = new Vector((Vector)value);
boolean wasPresent = locksVector.removeElement(lock);
if (!wasPresent) {
throw new LockTokenNotFoundException(lock);
}
locksVector.addElement(lock.cloneObject());
+ locksCache.put(uri.toString(), locksVector);
}
} finally {
delist(this);
@@ -656,12 +657,13 @@
Object value = locksCache.get(uri.toString());
Vector locksVector = null;
if (value != null) {
- locksVector = (Vector) value;
+ locksVector = new Vector((Vector)value);
boolean wasPresent = locksVector.removeElement(lock);
if (!wasPresent) {
throw new LockTokenNotFoundException(lock);
}
}
+ locksCache.put(uri.toString(), locksVector);
} finally {
delist(this);
}
@@ -676,12 +678,13 @@
Object value = locksCache.get(uri.toString());
Vector locksVector = null;
if (value != null) {
- locksVector = (Vector) value;
+ locksVector = new Vector((Vector)value);
boolean wasPresent = locksVector.removeElement(lock);
if (!wasPresent) {
throw new LockTokenNotFoundException(lock);
}
}
+ locksCache.put(uri.toString(), locksVector);
} finally {
delist(this);
}
@@ -718,7 +721,7 @@
return super.enumerateLocks(uri);
}
}
-
+
public NodeRevisionDescriptors retrieveRevisionDescriptors(Uri uri)
throws ServiceAccessException, RevisionDescriptorNotFoundException {
if (revisionDescriptorsStore.cacheResults()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: slide-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: slide-dev-help@jakarta.apache.org