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 pn...@apache.org on 2002/08/05 10:28:53 UTC
cvs commit: jakarta-slide/src/webdav/server/org/apache/slide/webdav/method CheckinMethod.java CheckoutMethod.java ReportMethod.java UncheckoutMethod.java
pnever 2002/08/05 01:28:53
Modified: src/webdav/server/org/apache/slide/webdav/method
CheckinMethod.java CheckoutMethod.java
ReportMethod.java UncheckoutMethod.java
Log:
Suppressed disturbing stack traces.
Revision Changes Path
1.13 +8 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CheckinMethod.java
Index: CheckinMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CheckinMethod.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- CheckinMethod.java 31 Jul 2002 09:10:51 -0000 1.12
+++ CheckinMethod.java 5 Aug 2002 08:28:53 -0000 1.13
@@ -76,6 +76,7 @@
import org.apache.slide.common.Domain;
import org.apache.slide.common.NamespaceAccessToken;
+import org.apache.slide.common.SlideException;
import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.WebdavException;
import org.apache.slide.webdav.util.VersioningHelper;
@@ -180,9 +181,11 @@
throw e;
}
catch (Exception e) {
+ if( !(e instanceof SlideException) )
e.printStackTrace();
- resp.setStatus( getErrorCode(e) ); // special handling needed
- throw new WebdavException( WebdavStatus.SC_ACCEPTED, false ); // abort the TA
+ int statusCode = getErrorCode(e);
+ resp.sendError( statusCode ); // special handling needed
+ throw new WebdavException( statusCode, false ); // abort the TA
}
finally {
resp.setHeader(H_CACHE_CONTROL, NO_CACHE);
1.16 +7 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CheckoutMethod.java
Index: CheckoutMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/CheckoutMethod.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- CheckoutMethod.java 31 Jul 2002 12:24:00 -0000 1.15
+++ CheckoutMethod.java 5 Aug 2002 08:28:53 -0000 1.16
@@ -224,9 +224,11 @@
throw e;
}
catch (Exception e) {
+ if( !(e instanceof SlideException) )
e.printStackTrace();
- resp.setStatus( getErrorCode(e) ); // special handling needed
- throw new WebdavException( WebdavStatus.SC_ACCEPTED, false ); // abort the TA
+ int statusCode = getErrorCode(e);
+ resp.sendError( statusCode ); // special handling needed
+ throw new WebdavException( statusCode, false ); // abort the TA
}
finally {
resp.setHeader(H_CACHE_CONTROL, NO_CACHE);
1.44 +5 -4 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java
Index: ReportMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/ReportMethod.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- ReportMethod.java 23 Jul 2002 12:36:57 -0000 1.43
+++ ReportMethod.java 5 Aug 2002 08:28:53 -0000 1.44
@@ -625,6 +625,7 @@
throw e;
}
catch (Exception e) {
+ if( !(e instanceof SlideException) )
e.printStackTrace();
try {
String statusText = getStatusText(e);
1.9 +8 -5 jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UncheckoutMethod.java
Index: UncheckoutMethod.java
===================================================================
RCS file: /home/cvs/jakarta-slide/src/webdav/server/org/apache/slide/webdav/method/UncheckoutMethod.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- UncheckoutMethod.java 21 Jun 2002 08:09:11 -0000 1.8
+++ UncheckoutMethod.java 5 Aug 2002 08:28:53 -0000 1.9
@@ -74,6 +74,7 @@
import org.jdom.output.XMLOutputter;
import org.apache.slide.common.NamespaceAccessToken;
+import org.apache.slide.common.SlideException;
import org.apache.slide.webdav.WebdavServletConfig;
import org.apache.slide.webdav.WebdavException;
import org.apache.slide.webdav.util.VersioningHelper;
@@ -162,9 +163,11 @@
throw e;
}
catch (Exception e) {
+ if( !(e instanceof SlideException) )
e.printStackTrace();
- resp.setStatus( getErrorCode(e) ); // special handling needed
- throw new WebdavException( WebdavStatus.SC_ACCEPTED, false ); // abort the TA
+ int statusCode = getErrorCode(e);
+ resp.sendError( statusCode ); // special handling needed
+ throw new WebdavException( statusCode, false ); // abort the TA
}
finally {
resp.setHeader(H_CACHE_CONTROL, NO_CACHE);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>