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 re...@apache.org on 2001/06/20 03:33:10 UTC
cvs commit: jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods PropPatchMethod.java
remm 01/06/19 18:33:10
Modified: src/webdav/client/src/org/apache/webdav/lib/methods
PropPatchMethod.java
Log:
- Fix a bug where multiple prop elements would be generated as children of
set and remove, which is incorrect.
Patch submitted by Robert Owen <eurrow at sas.com>
Note : I slightly simplified the code submitted, because in both cases we test
that there's at least one property to be set or removed. I think it should be ok, let
me know if it isn't.
Revision Changes Path
1.18 +8 -7 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropPatchMethod.java
Index: PropPatchMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropPatchMethod.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- PropPatchMethod.java 2001/05/01 21:28:01 1.17
+++ PropPatchMethod.java 2001/06/20 01:33:10 1.18
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropPatchMethod.java,v 1.17 2001/05/01 21:28:01 remm Exp $
- * $Revision: 1.17 $
- * $Date: 2001/05/01 21:28:01 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/PropPatchMethod.java,v 1.18 2001/06/20 01:33:10 remm Exp $
+ * $Revision: 1.18 $
+ * $Date: 2001/06/20 01:33:10 $
*
* ====================================================================
*
@@ -81,6 +81,7 @@
*
* @author <a href="mailto:remm@apache.org">Remy Maucherat</a>
* @author <a href="mailto:bcholmes@interlog.com">B.C. Holmes</a>
+ * @author <a href="mailto:eurrow@sas.com">Robert Owen</a>
*/
public class PropPatchMethod
extends XMLResponseMethodBase {
@@ -242,13 +243,13 @@
printer.writeElement("D", null, "set", XMLPrinter.OPENING);
Enumeration toSetList = toSet.elements();
+ printer.writeElement("D", null, "prop", XMLPrinter.OPENING);
while (toSetList.hasMoreElements()) {
Property current = (Property) toSetList.nextElement();
- printer.writeElement("D", null, "prop", XMLPrinter.OPENING);
printer.writeProperty(current.namespace, current.namespaceInfo,
current.name, current.value);
- printer.writeElement("D", null, "prop", XMLPrinter.CLOSING);
}
+ printer.writeElement("D", null, "prop", XMLPrinter.CLOSING);
printer.writeElement("D", null, "set", XMLPrinter.CLOSING);
@@ -259,13 +260,13 @@
printer.writeElement("D", null, "remove", XMLPrinter.OPENING);
Enumeration toRemoveList = toRemove.elements();
+ printer.writeElement("D", null, "prop", XMLPrinter.OPENING);
while (toRemoveList.hasMoreElements()) {
Property current = (Property) toRemoveList.nextElement();
- printer.writeElement("D", null, "prop", XMLPrinter.OPENING);
printer.writeElement(current.namespace, current.namespaceInfo,
current.name, XMLPrinter.NO_CONTENT);
- printer.writeElement("D", null, "prop", XMLPrinter.CLOSING);
}
+ printer.writeElement("D", null, "prop", XMLPrinter.CLOSING);
printer.writeElement("D", null, "remove", XMLPrinter.CLOSING);