GRAILS-1276

git-svn-id: https://svn.codehaus.org/grails/trunk@4665 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: leebutts

src/grails/grails-app/taglib/JavascriptTagLib.groovy

@@ -59,7 +59,7 @@ class JavascriptTagLib  {
 	 **/
 	def javascript = { attrs, body ->
 		setUpRequestAttributes();
-        def requestPluginContext = request[CONTROLLER].pluginContextPath
+        def requestPluginContext = request[CONTROLLER]?.pluginContextPath
 		if(attrs.src) {
 			out << '<script type="text/javascript" src="'
 			out <<  grailsAttributes.getApplicationUri(request)

test/groovy/org/codehaus/groovy/grails/web/taglib/JavaScriptTagLibTests.groovy

@@ -126,6 +126,18 @@ public class JavaScriptTagLibTests extends AbstractGrailsTagTests {
            assertEquals("<script type=\"text/javascript\" src=\"/myapp/js/lib.js\"></script>" + System.getProperty("line.separator"),sw.toString())
         }
    }
+   
+    public void testJSSrcWithNoController (){
+        StringWriter sw = new StringWriter()
+        PrintWriter pw = new PrintWriter(sw)
+        withTag("javascript",pw) { tag ->
+           def attrs = [src:'lib.js']
+           setRequestContext()
+           request.setAttribute(GrailsApplicationAttributes.CONTROLLER, null);
+           tag.call(attrs) { }
+           assertEquals("<script type=\"text/javascript\" src=\"/myapp/js/lib.js\"></script>" + System.getProperty("line.separator"),sw.toString())
+        }
+   }
 
    public void testJSLib (){
         StringWriter sw = new StringWriter()