Merge pull request #5502 from eclipse-ee4j/mojarra_issue_5488_non_act…

…ion_ajax_event_should_not_trigger_action_event

Fix #5488: non-action ajax event shouldn't trigger action event

impl/src/main/java/com/sun/faces/renderkit/html_basic/ButtonRenderer.java

@@ -171,29 +171,17 @@ public void encodeEnd(FacesContext context, UIComponent component) throws IOExce
      */
     private static boolean wasClicked(FacesContext context, UIComponent component, String clientId) {
 
-        // Was our command the one that caused this submission?
-        // we don' have to worry about getting the value from request parameter
-        // because we just need to know if this command caused the submission. We
-        // can get the command name by calling currentValue. This way we can
-        // get around the IE bug.
-
         if (clientId == null) {
             clientId = component.getClientId(context);
         }
 
         if (context.getPartialViewContext().isAjaxRequest()) {
-            return BEHAVIOR_SOURCE_PARAM.getValue(context).equals(clientId);
+            return RenderKitUtils.isPartialOrBehaviorAction(context, clientId);
         } else {
             Map<String, String> requestParameterMap = context.getExternalContext().getRequestParameterMap();
 
             if (requestParameterMap.get(clientId) == null) {
-
-                // Check to see whether we've got an action event
-                // as a result of a partial/behavior postback.
-                if (RenderKitUtils.isPartialOrBehaviorAction(context, clientId)) {
-                    return true;
-                }
-
+                // Check to see whether we've got an action event from button of type="image"
                 StringBuilder builder = new StringBuilder(clientId);
                 String xValue = builder.append(".x").toString();
                 builder.setLength(clientId.length());