Fix null pointer issue when attrs are not supplied to withTag

grails · Aug 20, 2013 · 5ef47e2 · 5ef47e2
1 parent 3650f39
commit 5ef47e2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...sp/src/main/groovy/org/codehaus/groovy/grails/plugins/web/taglib/ApplicationTagLib.groovy b/...sp/src/main/groovy/org/codehaus/groovy/grails/plugins/web/taglib/ApplicationTagLib.groovy
@@ -387,7 +387,7 @@ class ApplicationTagLib implements ApplicationContextAware, InitializingBean, Gr
     Closure withTag = { attrs, body ->
         def writer = out
         writer << "<${attrs.name}"
-        attrs.attrs.each { k,v ->
+        attrs.attrs?.each { k,v ->
             if (!v) return
             if (v instanceof Closure) {
                 writer << " $k=\""

diff --git a/...e-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/ApplicationTagLibTests.groovy b/...e-web/src/test/groovy/org/codehaus/groovy/grails/web/taglib/ApplicationTagLibTests.groovy
@@ -423,4 +423,12 @@ class ApplicationTagLibTests extends AbstractGrailsTagTests {
         def template = '<g:createLink controller="foo" action="bar" id="|prop:8888" />'
         assertOutputEquals '/foo/bar/%7Cprop%3A8888', template
     }
+
+    void testWithTagWithNameAndAttrs() {
+        def template = '<g:withTag name="div" attrs="[class: 'foo']>body</g:withTag>'
+        assertOutputEquals '<div class="foo">body</div>', template
+
+        template = '<g:withTag name="div">body</g:withTag>'
+        assertOutputEquals '<div>body</div>', template
+    }
 }