You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2013/08/29 02:59:57 UTC

svn commit: r1518438 - /myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java

Author: lu4242
Date: Thu Aug 29 00:59:56 2013
New Revision: 1518438

URL: http://svn.apache.org/r1518438
Log:
MYFACES-3760 ClientBehaviorRenderer is added multiple times in FacesConfigurator 

Modified:
    myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java

Modified: myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java?rev=1518438&r1=1518437&r2=1518438&view=diff
==============================================================================
--- myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java (original)
+++ myfaces/core/branches/2.1.x/impl/src/main/java/org/apache/myfaces/config/FacesConfigurator.java Thu Aug 29 00:59:56 2013
@@ -902,8 +902,6 @@ public class FacesConfigurator
             for (Renderer element : dispenser.getRenderers(renderKitId))
             {
                 javax.faces.render.Renderer renderer;
-                Collection<ClientBehaviorRenderer> clientBehaviorRenderers
-                        = dispenser.getClientBehaviorRenderers(renderKitId);
 
                 try
                 {
@@ -917,29 +915,31 @@ public class FacesConfigurator
                 }
 
                 renderKit.addRenderer(element.getComponentFamily(), element.getRendererType(), renderer);
+            }
+            
+            // Add in client behavior renderers.
+            Collection<ClientBehaviorRenderer> clientBehaviorRenderers
+                        = dispenser.getClientBehaviorRenderers(renderKitId);
 
-                // Add in client behavior renderers.
-
-                for (ClientBehaviorRenderer clientBehaviorRenderer : clientBehaviorRenderers)
+            for (ClientBehaviorRenderer clientBehaviorRenderer : clientBehaviorRenderers)
+            {
+                try
                 {
-                    try
-                    {
-                        javax.faces.render.ClientBehaviorRenderer behaviorRenderer
-                                = (javax.faces.render.ClientBehaviorRenderer)
-                                ClassUtils.newInstance(clientBehaviorRenderer.getRendererClass());
+                    javax.faces.render.ClientBehaviorRenderer behaviorRenderer
+                            = (javax.faces.render.ClientBehaviorRenderer)
+                            ClassUtils.newInstance(clientBehaviorRenderer.getRendererClass());
 
-                        renderKit.addClientBehaviorRenderer(clientBehaviorRenderer.getRendererType(), behaviorRenderer);
-                    }
+                    renderKit.addClientBehaviorRenderer(clientBehaviorRenderer.getRendererType(), behaviorRenderer);
+                }
 
-                    catch (Throwable e)
-                    {
-                        // Ignore.
+                catch (Throwable e)
+                {
+                    // Ignore.
 
-                        if (log.isLoggable(Level.SEVERE))
-                        {
-                            log.log(Level.SEVERE, "failed to configure client behavior renderer class " +
-                                    clientBehaviorRenderer.getRendererClass(), e);
-                        }
+                    if (log.isLoggable(Level.SEVERE))
+                    {
+                        log.log(Level.SEVERE, "failed to configure client behavior renderer class " +
+                                clientBehaviorRenderer.getRendererClass(), e);
                     }
                 }
             }