You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by cr...@apache.org on 2007/03/12 17:23:21 UTC

svn commit: r517272 - /beehive/trunk/netui/test/webapps/drt/src/bugs/j1130/Controller.java

Author: crogers
Date: Mon Mar 12 09:23:21 2007
New Revision: 517272

URL: http://svn.apache.org/viewvc?view=rev&rev=517272
Log:
Minor modification to this test case so that it can handle JEE EL exceptions as well.

Tests: NetUI BVT (WinXP passed)


Modified:
    beehive/trunk/netui/test/webapps/drt/src/bugs/j1130/Controller.java

Modified: beehive/trunk/netui/test/webapps/drt/src/bugs/j1130/Controller.java
URL: http://svn.apache.org/viewvc/beehive/trunk/netui/test/webapps/drt/src/bugs/j1130/Controller.java?view=diff&rev=517272&r1=517271&r2=517272
==============================================================================
--- beehive/trunk/netui/test/webapps/drt/src/bugs/j1130/Controller.java (original)
+++ beehive/trunk/netui/test/webapps/drt/src/bugs/j1130/Controller.java Mon Mar 12 09:23:21 2007
@@ -28,7 +28,7 @@
     },
     catches = {
         @Jpf.Catch(
-            type = java.lang.IllegalStateException.class,
+            type = java.lang.Exception.class,
             method = "testExceptionHandler",
             message="Caught a test exception!")
     }
@@ -51,10 +51,15 @@
                 name = "handleError",
                 path = "error.jsp")
         })
-    protected Forward testExceptionHandler(java.lang.IllegalStateException ex,
-                                           String actionName,
-                                           String message, Object form) {
-        _message = "..." + ex;
+    protected Forward testExceptionHandler(
+            java.lang.Exception ex, String actionName,
+            String message, Object form) {
+        java.lang.Throwable cause = ex.getCause();
+        if (cause == null) {
+            cause = ex;
+        }
+        _message = "..." + cause.getClass().getName()
+                   + ": " + cause.getMessage();
         return new Forward("handleError");
     }
 }