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 2011/07/06 17:53:43 UTC

svn commit: r1143473 - /myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java

Author: lu4242
Date: Wed Jul  6 15:53:42 2011
New Revision: 1143473

URL: http://svn.apache.org/viewvc?rev=1143473&view=rev
Log:
MYFACES-3208 When searching tag handler names space is not checked in case of composite library, incorrect detection on repeated tag name on different name spaces

Modified:
    myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java

Modified: myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java?rev=1143473&r1=1143472&r2=1143473&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/view/facelets/compiler/TagLibraryConfig.java Wed Jul  6 15:53:42 2011
@@ -89,7 +89,7 @@ public final class TagLibraryConfig
         {
             boolean result = super.containsTagHandler(ns, localName);
             
-            if (!result && _compositeLibraryName != null)
+            if (!result && _compositeLibraryName != null && containsNamespace(ns))
             {
                 ResourceHandler resourceHandler = 
                     FacesContext.getCurrentInstance().getApplication().getResourceHandler();
@@ -112,7 +112,7 @@ public final class TagLibraryConfig
         {
             TagHandler tagHandler = super.createTagHandler(ns, localName, tag);
             
-            if (tagHandler == null && containsNamespace(ns) && _compositeLibraryName != null)
+            if (tagHandler == null && _compositeLibraryName != null && containsNamespace(ns))
             {
                 ResourceHandler resourceHandler = 
                     FacesContext.getCurrentInstance().getApplication().getResourceHandler();