You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by de...@apache.org on 2017/01/26 21:00:46 UTC

svn commit: r1780480 - /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TobagoClientBehaviorRenderer.java

Author: deki
Date: Thu Jan 26 21:00:46 2017
New Revision: 1780480

URL: http://svn.apache.org/viewvc?rev=1780480&view=rev
Log:
TOBAGO-1671: avoid NPE - fixes Blocker violation reported by Sonar

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TobagoClientBehaviorRenderer.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TobagoClientBehaviorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TobagoClientBehaviorRenderer.java?rev=1780480&r1=1780479&r2=1780480&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TobagoClientBehaviorRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TobagoClientBehaviorRenderer.java Thu Jan 26 21:00:46 2017
@@ -97,13 +97,16 @@ public class TobagoClientBehaviorRendere
       actionId = clientId;
     } else if (behavior instanceof EventBehavior) { // <tc:event>
       AbstractUIEvent event = findEvent(uiComponent, eventName);
-      if (event != null && !event.isRendered()){
-        return null;
+      if (event != null) {
+        if (!event.isRendered()) {
+          return null;
+        } else {
+          transition = event.isTransition();
+          target = event.getTarget();
+          actionId = event.getClientId(facesContext);
+          omit = event.isOmit() || StringUtils.isNotBlank(RenderUtils.generateUrl(facesContext, event));
+        }
       }
-      transition = event.isTransition();
-      target = event.getTarget();
-      actionId = event.getClientId(facesContext);
-      omit = event.isOmit() || StringUtils.isNotBlank(RenderUtils.generateUrl(facesContext, event));
     } else {
       LOG.warn("Unknown behavior '{}'!", behavior.getClass().getName());
     }