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 ju...@apache.org on 2002/08/12 13:45:40 UTC
cvs commit: jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods OptionsMethod.java XMLResponseMethodBase.java
juergen 2002/08/12 04:45:39
Modified: src/webdav/client/src/org/apache/webdav/lib/methods
OptionsMethod.java XMLResponseMethodBase.java
Log:
the options method may deliver an xml body with response == 200.
Revision Changes Path
1.11 +6 -45 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/OptionsMethod.java
Index: OptionsMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/OptionsMethod.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- OptionsMethod.java 25 Apr 2002 21:27:30 -0000 1.10
+++ OptionsMethod.java 12 Aug 2002 11:45:39 -0000 1.11
@@ -187,11 +187,6 @@
}
// ----------------------------------------------------- Instance Variables
-
- private Hashtable responseHashtable = null;
-
- private Document responseDocument = null;
-
/**
* DAV Capabilities.
*/
@@ -296,6 +291,9 @@
*/
public String generateQuery() { //return null;
+ if (query != null) return query;
+
+
if (type != 0){
XMLPrinter printer = new XMLPrinter();
printer.writeXMLHeader();
@@ -350,15 +348,6 @@
return (Enumeration) result;
}
- public void parseResponse(InputStream input)
- throws IOException{
- try{
- Document responseDocument = parseResponseContent(input);
- this.responseDocument = responseDocument;
-
- } catch (Exception any){ any.printStackTrace();}
-
- }
protected Document parseResponseContent(InputStream is)
throws ParserConfigurationException, SAXException, IOException {
@@ -404,34 +393,6 @@
}
- protected Hashtable getResponseHashtable() {
- checkUsed();
- if (responseHashtable == null) {
- initResponseHashtable();
- }
- return responseHashtable;
- }
-
-
- private synchronized void initResponseHashtable() {
- if (responseHashtable == null) {
-
- responseHashtable = new Hashtable();
- int status = getStatusCode();
-
- if (responseDocument != null) {
- //System.out.println("adding Response");
-
- Response response = new OptionsResponse(responseDocument,
- getPath(), status);
- responseHashtable.put(response.getHref(), response);
-
- setDocument(responseDocument);
- setResponseHashtable(responseHashtable);
- //System.out.println(response);
- }
- }
- }
}
1.32 +4 -3 jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/XMLResponseMethodBase.java
Index: XMLResponseMethodBase.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/client/src/org/apache/webdav/lib/methods/XMLResponseMethodBase.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- XMLResponseMethodBase.java 2 Aug 2002 15:20:24 -0000 1.31
+++ XMLResponseMethodBase.java 12 Aug 2002 11:45:39 -0000 1.32
@@ -224,6 +224,7 @@
{
if (getStatusCode() == WebdavStatus.SC_MULTI_STATUS ||
getStatusCode() == WebdavStatus.SC_CONFLICT ||
+ getStatusCode() == WebdavStatus.SC_OK ||
getStatusCode() == WebdavStatus.SC_BAD_REQUEST ||
getStatusCode() == WebdavStatus.SC_FORBIDDEN ) {
parseXMLResponse(input);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>