luetzkendorf 2005/01/14 01:20:54
Modified: src/share/org/apache/slide/macro Tag:
SLIDE_2_1_RELEASE_BRANCH MacroImpl.java
Log:
fix for bug: after copy/move of non collection resource with content-length:
0 returns GET "not-found"
Revision Changes Path
No revision
No revision
1.41.2.4 +7 -5
jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java
Index: MacroImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-slide/src/share/org/apache/slide/macro/MacroImpl.java,v
retrieving revision 1.41.2.3
retrieving revision 1.41.2.4
diff -u -r1.41.2.3 -r1.41.2.4
--- MacroImpl.java 8 Nov 2004 08:39:18 -0000 1.41.2.3
+++ MacroImpl.java 14 Jan 2005 09:20:54 -0000 1.41.2.4
@@ -58,6 +58,7 @@
import org.apache.slide.structure.ObjectNotFoundException;
import org.apache.slide.structure.Structure;
import org.apache.slide.util.Configuration;
+import org.apache.slide.webdav.util.WebdavConstants;
import org.apache.slide.event.EventDispatcher;
import org.apache.slide.event.MacroEvent;
import org.apache.slide.event.VetoException;
@@ -682,7 +683,8 @@
NodeRevisionDescriptor sourceNrd =
contentHelper.retrieve(token, sourceNrds);
NodeRevisionContent sourceNrc = null;
- if (sourceNrd.getContentLength() > 0) {
+ //if (sourceNrd.getContentLength() > 0) {
+ if
(sourceNrd.propertyValueContains(WebdavConstants.P_RESOURCETYPE,
WebdavConstants.E_COLLECTION)) {
sourceNrc =
contentHelper.retrieve(token, sourceNrds, sourceNrd);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
