unico 2004/03/29 06:45:51
Modified: src/webdav/server/org/apache/slide/webdav Tag:
SLIDE_2_0_RELEASE_BRANCH WebdavServlet.java
Log:
- prevent possible NPE on shutdown
- cleanup unused variables
- some formatting
Revision Changes Path
No revision
No revision
1.54.2.2 +13 -13
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.54.2.1
retrieving revision 1.54.2.2
diff -u -r1.54.2.1 -r1.54.2.2
--- WebdavServlet.java 5 Feb 2004 16:11:22 -0000 1.54.2.1
+++ WebdavServlet.java 29 Mar 2004 14:45:51 -0000 1.54.2.2
@@ -132,18 +132,17 @@
if( token.getLogger().isEnabled(LOG_CHANNEL, Logger.DEBUG) )
token.getLogger().log("==> "+req.getMethod()+" start: "+sdf.format(new
Date(System.currentTimeMillis()))+" ["+Thread.currentThread().getName()+"]",
LOG_CHANNEL, Logger.DEBUG);
- WebdavServletConfig config = (WebdavServletConfig)getServletConfig();
try {
- long startTime = System.currentTimeMillis();
if (token == null) {
String namespaceName = req.getContextPath();
- if ((namespaceName == null) || (namespaceName.equals("")))
+ if ((namespaceName == null) || (namespaceName.equals(""))) {
namespaceName = Domain.getDefaultNamespace();
- while (namespaceName.startsWith("/"))
+ }
+ while (namespaceName.startsWith("/")) {
namespaceName = namespaceName.substring(1);
- token = Domain.accessNamespace
- (new SecurityToken(this), namespaceName);
+ }
+ token = Domain.accessNamespace(new SecurityToken(this),
namespaceName);
}
resp.setStatus(WebdavStatus.SC_OK);
@@ -284,8 +283,7 @@
// Setup the method factory
methodFactory =
- WebdavMethodFactory.newInstance(
-
(WebdavServletConfig)getServletConfig());
+
WebdavMethodFactory.newInstance((WebdavServletConfig)getServletConfig());
// Check whether directory browsing is enabled, and how it should be
// accomplished
@@ -315,7 +313,9 @@
public void destroy() {
if (handleLifecycle) {
- Domain.closeNamespace(token);
+ if (token != null) {
+ Domain.closeNamespace(token);
+ }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
