Fix failing tests broken by commit d610837 (Change TagLib cache key /…

… separation logic)
grails · Nov 28, 2011 · 3d0df4d · 3d0df4d
1 parent a21e505
commit 3d0df4d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/grails-plugin-testing/src/main/groovy/grails/test/mixin/support/LazyTagLibraryLookup.java b/grails-plugin-testing/src/main/groovy/grails/test/mixin/support/LazyTagLibraryLookup.java
@@ -119,6 +119,11 @@ protected String tagNameKey(String namespace, String tagName) {
         return namespace + ':' + tagName;
     }    
 
+    @Override
+    protected void putTagLib(Map<String, Object> tags, String name, GrailsTagLibClass taglib){
+        tags.put(name, taglib.getFullName());
+    }
+
     @Override
     public void registerTagLib(GrailsTagLibClass taglib) {
 

diff --git a/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/pages/TagLibraryLookup.java b/grails-web/src/main/groovy/org/codehaus/groovy/grails/web/pages/TagLibraryLookup.java
@@ -91,21 +91,21 @@ public void registerTagLib(GrailsTagLibClass taglib) {
             tagsThatReturnObject=new HashSet<String>();
             tagsThatReturnObjectForNamespace.put(namespace, tagsThatReturnObject);
         }
+        Map<String, Object> tags = tagNamespaces.get(namespace);
+        if(tags==null) {
+            tags = new HashMap<String, Object>();
+            tagNamespaces.put(namespace, tags);
+        }
         for (String tagName : taglib.getTagNames()) {
-            putTagLib(namespace, tagName, taglib);
+            putTagLib(tags, tagName, taglib);
             tagsThatReturnObject.remove(tagName);
         }
         for (String tagName : taglib.getTagNamesThatReturnObject()) {
             tagsThatReturnObject.add(tagName);
         }
     }
 
-    protected void putTagLib(String namespace, String name, GrailsTagLibClass taglib){
-        Map<String, Object>tags = tagNamespaces.get(namespace);
-        if(tags==null) {
-            tags = new HashMap<String, Object>();
-            tagNamespaces.put(namespace, tags);
-        }
+    protected void putTagLib(Map<String, Object> tags, String name, GrailsTagLibClass taglib){
         tags.put(name, applicationContext.getBean(taglib.getFullName()));
     }