[richfaces-svn-commits] JBoss Rich Faces SVN: r18797 - trunk/ui/core/ui/src/main/java/org/ajax4jsf/component/behavior.

[richfaces-svn-commits at lists.jboss.org]

Author: abelevich
Date: 2010-08-19 06:42:19 -0400 (Thu, 19 Aug 2010)
New Revision: 18797

Modified:
   trunk/ui/core/ui/src/main/java/org/ajax4jsf/component/behavior/MethodExpressionAjaxBehaviorListener.java
Log:
https://jira.jboss.org/browse/RF-9095

Modified: trunk/ui/core/ui/src/main/java/org/ajax4jsf/component/behavior/MethodExpressionAjaxBehaviorListener.java
===================================================================
--- trunk/ui/core/ui/src/main/java/org/ajax4jsf/component/behavior/MethodExpressionAjaxBehaviorListener.java	2010-08-19 09:18:01 UTC (rev 18796)
+++ trunk/ui/core/ui/src/main/java/org/ajax4jsf/component/behavior/MethodExpressionAjaxBehaviorListener.java	2010-08-19 10:42:19 UTC (rev 18797)
@@ -23,7 +23,6 @@
 package org.ajax4jsf.component.behavior;
 
 import javax.el.ELContext;
-import javax.el.ELException;
 import javax.el.MethodExpression;
 import javax.el.MethodNotFoundException;
 import javax.faces.component.StateHolder;
@@ -67,36 +66,14 @@
 
     public void processAjaxBehavior(AjaxBehaviorEvent event) throws AbortProcessingException {
 
-        Throwable cause = null;
-        Throwable thrown = null;
-
-        if (event == null) {
-            throw new NullPointerException();
-        }
-
         FacesContext context = FacesContext.getCurrentInstance();
         ELContext elContext = context.getELContext();
+        
         try {
             methodExpressionZeroArg.invoke(elContext, new Object[] {});
         } catch (MethodNotFoundException mnfe) {
-            if (null != methodExpressionOneArg) {
-
-                try {
-                    methodExpressionOneArg.invoke(elContext, new Object[] { event});
-                } catch (ELException ee) {
-                    cause = ee.getCause();
-                    thrown = ee;
-                }
-            }
-        } catch (ELException ee) {
-            cause = ee.getCause();
-            thrown = ee;
-        }
-
-        if (null != thrown) {
-            throw cause == null ? new AbortProcessingException(thrown.getMessage(), thrown)
-                : new AbortProcessingException(thrown.getMessage(), cause);
-        }
+            methodExpressionOneArg.invoke(elContext, new Object[] { event});
+        } 
     }
 
     public boolean isTransient() {