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 2001/08/10 10:23:33 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav WebdavServlet.java
juergen 01/08/10 01:23:33
Modified: src/webdav/server/org/apache/slide/webdav WebdavServlet.java
Log:
in case of a fatal error return INTERNAL_SERVER_ERROR. copy did return OK.
Revision Changes Path
1.21 +10 -9 jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java
Index: WebdavServlet.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- WebdavServlet.java 2001/08/06 11:30:05 1.20
+++ WebdavServlet.java 2001/08/10 08:23:33 1.21
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v 1.20 2001/08/06 11:30:05 cmlenz Exp $
- * $Revision: 1.20 $
- * $Date: 2001/08/06 11:30:05 $
+ * $Header: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/WebdavServlet.java,v 1.21 2001/08/10 08:23:33 juergen Exp $
+ * $Revision: 1.21 $
+ * $Date: 2001/08/10 08:23:33 $
*
* ====================================================================
*
@@ -214,7 +214,7 @@
long startTime = System.currentTimeMillis();
- // if logging for the request/response is required initialise the
+ // if logging for the request/response is required initialise the
// facades
if (Domain.isEnabled
("org.apache.slide.webdav.WebdavServlet.requestResponseLogger",
@@ -237,7 +237,7 @@
try {
String methodName = req.getMethod();
- if ((methodName.equalsIgnoreCase("GET") ||
+ if ((methodName.equalsIgnoreCase("GET") ||
methodName.equalsIgnoreCase("POST")) &&
WebdavMethod.isCollection(req, token)) {
// let the standard doGet() / doPost() methods handle
@@ -255,6 +255,7 @@
e.printStackTrace();
} catch (Throwable e) {
// If something goes really wrong ...
+ resp.sendError(WebdavStatus.SC_INTERNAL_SERVER_ERROR);
e.printStackTrace();
}
@@ -282,7 +283,7 @@
(((XHttpServletResponseFacade)resp)
.getStatus())))
: ("") )
- + " (time: " + (System.currentTimeMillis() - startTime)
+ + " (time: " + (System.currentTimeMillis() - startTime)
+ " ms)"
+ " URI = " + WebdavMethod.getRelativePath(req));
@@ -327,7 +328,7 @@
try {
- URL domainConfigFileURL =
+ URL domainConfigFileURL =
getServletContext().getResource(domainConfigFile);
if (domainConfigFileURL != null) {
Domain.init(domainConfigFileURL);
@@ -335,7 +336,7 @@
if (namespaceName == null) {
namespaceName = Domain.getDefaultNamespace();
- log("No namespace specified, will use default namespace: " +
+ log("No namespace specified, will use default namespace: " +
namespaceName);
}
@@ -343,7 +344,7 @@
(new SecurityToken(this), namespaceName);
if (token == null) {
log("Could not access namespace " + namespaceName + ".");
- throw new UnavailableException("Namespace " + namespaceName +
+ throw new UnavailableException("Namespace " + namespaceName +
" not accessible");
}