pnever 02/05/15 02:17:32
Modified: src/share/org/apache/slide/content ContentImpl.java
Log:
Step backwards ... removed redirect handling from remove (removing versions anyway
forbidden for the moment)
Revision Changes Path
1.37 +5 -15
jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java
Index: ContentImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ContentImpl.java 14 May 2002 15:33:06 -0000 1.36
+++ ContentImpl.java 15 May 2002 09:17:32 -0000 1.37
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.36
2002/05/14 15:33:06 pnever Exp $
- * $Revision: 1.36 $
- * $Date: 2002/05/14 15:33:06 $
+ * $Header:
/home/cvs/jakarta-slide/src/share/org/apache/slide/content/ContentImpl.java,v 1.37
2002/05/15 09:17:32 pnever Exp $
+ * $Revision: 1.37 $
+ * $Date: 2002/05/15 09:17:32 $
*
* ====================================================================
*
@@ -82,8 +82,8 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Remy Maucherat</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Christopher Lenz</a>
* @author Jean-Philippe Courson
- * @version $Revision: 1.36 $
- * @version $Revision: 1.36 $
+ * @version $Revision: 1.37 $
+ * @version $Revision: 1.37 $
*/
public final class ContentImpl implements Content {
@@ -1010,9 +1010,6 @@
ObjectNode associatedObject = structureHelper.retrieve
(token, revisionDescriptors.getUri(), false);
- NodeRevisionNumber latestNrn = redirectLatestRevisionNumber(
- Domain.accessNamespace(null, namespace.getName()),
revisionDescriptors.getOriginalUri() );
-
// Next we do a security check and a locking check for modifyRevisions
securityHelper.checkCredentials
(token, associatedObject,
@@ -1027,14 +1024,7 @@
namespaceConfig.getRemoveRevisionContentAction());
Uri objectUri = namespace.getUri(token, revisionDescriptors.getUri());
- if( latestNrn == null
- ||
revisionDescriptors.getUri().equals(revisionDescriptors.getOriginalUri()) ) {
-
objectUri.getStore().removeRevisionDescriptors(objectUri);
- }
- else {
- objectUri.getStore().removeRevisionDescriptor(objectUri, latestNrn);
- }
// Invoke interceptors
invokeInterceptors(token, revisionDescriptors, null, null,
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
