[#277] @catch annotated method received null pointer arg

playframework · Oct 12, 2010 · 707793b · 707793b
1 parent a163e49
commit 707793b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/framework/src/play/mvc/ActionInvoker.java b/framework/src/play/mvc/ActionInvoker.java
@@ -405,7 +405,7 @@ public static Object invokeControllerMethod(Method method) throws Exception {
 
     public static Object invokeControllerMethod(Method method, Object[] forceArgs) throws Exception {
         if (Modifier.isStatic(method.getModifiers()) && !method.getDeclaringClass().getName().matches("^controllers\\..*\\$class$")) {
-            return method.invoke(null, getActionMethodArgs(method, null));
+            return method.invoke(null, forceArgs == null ? getActionMethodArgs(method, null) : forceArgs);
         } else if (Modifier.isStatic(method.getModifiers())) {
             Object[] args = getActionMethodArgs(method, null);
             args[0] = Http.Request.current().controllerClass.getDeclaredField("MODULE$").get(null);

diff --git a/samples-and-tests/just-test-cases/app/controllers/UsingBefore.java b/samples-and-tests/just-test-cases/app/controllers/UsingBefore.java
@@ -7,7 +7,7 @@
 
 public class UsingBefore extends Controller {
 
-    @Before(unless = {"a", "onlytest"})
+    @Before(unless = {"a", "onlytest", "fight"})
     static void yop(String name) {
         renderText("Yop " + name);
     }
@@ -37,4 +37,19 @@ static void beforeonlytest(String name) {
     public static void onlytest(String name) {
         renderText("onlynotwork :  " + name);
     }
+
+    public static void fight(String name) {
+        name.toString();
+        renderText(9/0);
+    }
+
+    @Catch(ArithmeticException.class)
+    static void catchDivByZero(Exception e) {
+        renderText("Oops, got " + e);
+    }
+
+    @Catch(NullPointerException.class)
+    static void catchNull(Exception e) {
+        renderText("Hey!, got " + e);
+    }
 }