luetzkendorf 2004/09/22 07:43:42
Modified: src/share/org/apache/slide/structure Tag:
SLIDE_2_1_RELEASE_BRANCH StructureImpl.java
Log:
removed retrival of 'realObject' before it is stored
Revision Changes Path
No revision
No revision
1.49.2.2 +14 -12
jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java
Index: StructureImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/structure/StructureImpl.java,v
retrieving revision 1.49.2.1
retrieving revision 1.49.2.2
diff -u -r1.49.2.1 -r1.49.2.2
--- StructureImpl.java 18 Aug 2004 08:37:24 -0000 1.49.2.1
+++ StructureImpl.java 22 Sep 2004 14:43:42 -0000 1.49.2.2
@@ -459,7 +459,7 @@
}
- public void store(SlideToken token, ObjectNode object, boolean
setModificationDate)
+ protected void store(SlideToken token, ObjectNode object, boolean
setModificationDate)
throws ServiceAccessException, ObjectNotFoundException,
AccessDeniedException, LinkedObjectNotFoundException, VetoException {
@@ -482,21 +482,23 @@
}
}
- ObjectNode realObject = retrieve(token, object.getUri(), false);
+ // working on realObject, we will lose changes immediatly done before call
of store
+ // i observerd this with some BIND testcases
+ //ObjectNode realObject = retrieve(token, object.getUri(), false);
securityHelper
- .checkCredentials(token, realObject,
+ .checkCredentials(token, object,
namespaceConfig.getCreateObjectAction());
- Uri realObjectUri = namespace.getUri(token, realObject.getUri());
- Store store = realObjectUri.getStore();
- store.storeObject(realObjectUri, object);
+ Uri uri = namespace.getUri(token, object.getUri());
+ Store store = uri.getStore();
+ store.storeObject(uri, object);
if (setModificationDate) {
try {
- NodeRevisionDescriptor revisionDescriptor =
store.retrieveRevisionDescriptor(realObjectUri, new NodeRevisionNumber());
+ NodeRevisionDescriptor revisionDescriptor =
store.retrieveRevisionDescriptor(uri, new NodeRevisionNumber());
revisionDescriptor.setModificationDate(new Date());
revisionDescriptor.setModificationUser(
securityHelper.getPrincipal(token).getPath().lastSegment());
- store.storeRevisionDescriptor(realObjectUri, revisionDescriptor );
+ store.storeRevisionDescriptor(uri, revisionDescriptor );
}
catch (RevisionDescriptorNotFoundException e) {
// ignore silently
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
