You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/06/18 07:44:52 UTC
svn commit: r415095 - in
/incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol:
AtomException.java AtomNotAuthorizedException.java
AtomNotFoundException.java AtomServlet.java
Author: snoopdave
Date: Sat Jun 17 22:44:51 2006
New Revision: 415095
URL: http://svn.apache.org/viewvc?rev=415095&view=rev
Log:
small improvement in error handling
Modified:
incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomException.java
incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomNotAuthorizedException.java
incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomNotFoundException.java
incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomServlet.java
Modified: incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomException.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomException.java?rev=415095&r1=415094&r2=415095&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomException.java (original)
+++ incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomException.java Sat Jun 17 22:44:51 2006
@@ -17,6 +17,7 @@
*/
package org.apache.roller.webservices.atomprotocol;
+import javax.servlet.http.HttpServletResponse;
import org.apache.roller.RollerException;
/**
@@ -34,5 +35,8 @@
}
public AtomException(Throwable t) {
super(t);
+ }
+ public int getStatus() {
+ return HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
}
}
Modified: incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomNotAuthorizedException.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomNotAuthorizedException.java?rev=415095&r1=415094&r2=415095&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomNotAuthorizedException.java (original)
+++ incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomNotAuthorizedException.java Sat Jun 17 22:44:51 2006
@@ -17,6 +17,8 @@
*/
package org.apache.roller.webservices.atomprotocol;
+import javax.servlet.http.HttpServletResponse;
+
/**
* Exception thrown by AtomHandler in case of 403.
*/
@@ -32,5 +34,8 @@
}
public AtomNotAuthorizedException(Throwable t) {
super(t);
+ }
+ public int getStatus() {
+ return HttpServletResponse.SC_UNAUTHORIZED;
}
}
Modified: incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomNotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomNotFoundException.java?rev=415095&r1=415094&r2=415095&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomNotFoundException.java (original)
+++ incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomNotFoundException.java Sat Jun 17 22:44:51 2006
@@ -17,6 +17,8 @@
*/
package org.apache.roller.webservices.atomprotocol;
+import javax.servlet.http.HttpServletResponse;
+
/**
* Exception thrown by AtomHandler in case of 404.
*/
@@ -32,5 +34,8 @@
}
public AtomNotFoundException(Throwable t) {
super(t);
+ }
+ public int getStatus() {
+ return HttpServletResponse.SC_NOT_FOUND;
}
}
Modified: incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomServlet.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomServlet.java?rev=415095&r1=415094&r2=415095&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomServlet.java (original)
+++ incubator/roller/branches/roller_2.4_appd9/src/org/apache/roller/webservices/atomprotocol/AtomServlet.java Sat Jun 17 22:44:51 2006
@@ -128,12 +128,9 @@
} else {
res.setStatus(HttpServletResponse.SC_NOT_FOUND);
}
- } catch (AtomNotFoundException anfe) {
- res.setStatus(HttpServletResponse.SC_NOT_FOUND);
- mLogger.debug(anfe);
- } catch (AtomNotAuthorizedException anae) {
- res.setStatus(HttpServletResponse.SC_FORBIDDEN);
- mLogger.debug(anae);
+ } catch (AtomException ae) {
+ res.setStatus(ae.getStatus());
+ mLogger.debug(ae);
} catch (Exception ae) {
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
mLogger.debug(ae);
@@ -203,12 +200,9 @@
} else {
res.setStatus(HttpServletResponse.SC_NOT_FOUND);
}
- } catch (AtomNotFoundException anfe) {
- res.setStatus(HttpServletResponse.SC_NOT_FOUND);
- mLogger.debug(anfe);
- } catch (AtomNotAuthorizedException anae) {
- res.setStatus(HttpServletResponse.SC_FORBIDDEN);
- mLogger.debug(anae);
+ } catch (AtomException ae) {
+ res.setStatus(ae.getStatus());
+ mLogger.debug(ae);
} catch (Exception ae) {
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
mLogger.debug(ae);
@@ -263,12 +257,9 @@
} else {
res.setStatus(HttpServletResponse.SC_NOT_FOUND);
}
- } catch (AtomNotFoundException anfe) {
- res.setStatus(HttpServletResponse.SC_NOT_FOUND);
- mLogger.debug(anfe);
- } catch (AtomNotAuthorizedException anae) {
- res.setStatus(HttpServletResponse.SC_FORBIDDEN);
- mLogger.debug(anae);
+ } catch (AtomException ae) {
+ res.setStatus(ae.getStatus());
+ mLogger.debug(ae);
} catch (Exception ae) {
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
mLogger.debug(ae);
@@ -297,12 +288,9 @@
else {
res.setStatus(HttpServletResponse.SC_NOT_FOUND);
}
- } catch (AtomNotFoundException anfe) {
- res.setStatus(HttpServletResponse.SC_NOT_FOUND);
- mLogger.debug(anfe);
- } catch (AtomNotAuthorizedException anae) {
- res.setStatus(HttpServletResponse.SC_FORBIDDEN);
- mLogger.debug(anae);
+ } catch (AtomException ae) {
+ res.setStatus(ae.getStatus());
+ mLogger.debug(ae);
} catch (Exception ae) {
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
mLogger.debug(ae);