fix for GRAILS-2572

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

Author: graeme

src/web/org/codehaus/groovy/grails/web/mapping/DefaultUrlCreator.java

@@ -26,6 +26,7 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -100,6 +101,7 @@ public String createURL(String controller, String action, Map parameterValues, S
     }
 
     private String createURLInternal(String controller, String action, Map parameterValues, boolean includeContextPath) {
+        if(parameterValues == null) parameterValues = new HashMap();
         GrailsWebRequest webRequest = (GrailsWebRequest) RequestContextHolder.currentRequestAttributes();
         boolean blankController = StringUtils.isBlank(controller);
         boolean blankAction = StringUtils.isBlank(action);

src/web/org/codehaus/groovy/grails/web/mapping/DefaultUrlMappingsHolder.java

@@ -115,10 +115,15 @@ public UrlCreator getReverseMapping(final String controller, final String action
             mapping = (UrlMapping)mappingsLookup.get(new UrlMappingKey(controller, action, Collections.EMPTY_SET));                   
         }
         if(mapping == null || (mapping instanceof ResponseCodeUrlMapping)) {
-            mapping = (UrlMapping)mappingsLookup.get(new UrlMappingKey(controller, null, DEFAULT_ACTION_PARAMS));
+            Set lookupParams = new HashSet(params.keySet());
+            lookupParams.addAll(DEFAULT_ACTION_PARAMS);
+            mapping = (UrlMapping)mappingsLookup.get(new UrlMappingKey(controller, null, lookupParams));
         }
         if(mapping == null || (mapping instanceof ResponseCodeUrlMapping)) {
-            mapping = (UrlMapping)mappingsLookup.get(new UrlMappingKey(null, null, DEFAULT_CONTROLLER_PARAMS));
+            Set lookupParams = new HashSet(params.keySet());
+            lookupParams.addAll(DEFAULT_CONTROLLER_PARAMS);
+
+            mapping = (UrlMapping)mappingsLookup.get(new UrlMappingKey(null, null, lookupParams));
         }
         if(mapping == null || (mapping instanceof ResponseCodeUrlMapping)) {
             return new DefaultUrlCreator(controller, action);

test/groovy/org/codehaus/groovy/grails/web/mapping/ReverseUrlMappingTests.groovy

@@ -0,0 +1,37 @@
+package org.codehaus.groovy.grails.web.mapping
+
+import org.codehaus.groovy.grails.web.taglib.AbstractGrailsTagTests
+
+/**
+ * @author Graeme Rocher
+ * @since 1.0
+ * 
+ * Created: Mar 19, 2008
+ */
+class ReverseUrlMappingTests extends AbstractGrailsTagTests{
+    public void onSetUp() {
+        gcl.parseClass '''
+public class CustomUrlMappings {
+static mappings = {
+"/$mslug/$controller/$action/$id?" {
+}
+}
+}'''
+
+        gcl.parseClass '''
+class ProductController {
+    def create = {}
+    def save = {}
+}
+'''
+    }
+
+
+    void testLinkTagRendering() {
+        def template = '<g:link controller="product" action="create" params="[mslug:mslug]">New Product</g:link>'
+
+        assertOutputEquals '<a href="/acme/product/create">New Product</a>', template, [mslug:"acme"]
+    }
+
+
+}