fix for GRAILS-1540

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

Author: graeme

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

@@ -111,19 +111,21 @@ public UrlCreator getReverseMapping(final String controller, final String action
         if(params == null) params = Collections.EMPTY_MAP;
 
         UrlMapping mapping = (UrlMapping)mappingsLookup.get(new UrlMappingKey(controller, action, params.keySet()));
+        if(mapping == null) {
+            mapping = (UrlMapping)mappingsLookup.get(new UrlMappingKey(controller, action, Collections.EMPTY_SET));                   
+        }
         if(mapping == null) {
             mapping = (UrlMapping)mappingsLookup.get(new UrlMappingKey(controller, null, DEFAULT_ACTION_PARAMS));
-            if(mapping == null) {
-                mapping = (UrlMapping)mappingsLookup.get(new UrlMappingKey(null, null, DEFAULT_CONTROLLER_PARAMS));
-                if(mapping == null) {
-                    return new DefaultUrlCreator(controller, action);
-                }
-                else {
-                    return mapping;
-                }
-            }
         }
-        return mapping;
+        if(mapping == null) {
+            mapping = (UrlMapping)mappingsLookup.get(new UrlMappingKey(null, null, DEFAULT_CONTROLLER_PARAMS));
+        }
+        if(mapping == null) {
+            return new DefaultUrlCreator(controller, action);
+        }
+        else {
+            return mapping;
+        }
     }
 
     /**

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

@@ -0,0 +1,50 @@
+/**
+ * Some more tests for the behaviour of reverse linking from mappings
+ 
+ * @author Graeme Rocher
+ * @since 0.6
+  *
+ * Created: Aug 29, 2007
+ * Time: 8:44:26 AM
+ * 
+ */
+package org.codehaus.groovy.grails.web.taglib
+
+import org.codehaus.groovy.grails.commons.*
+
+class OverlappingReverseMappedLinkTests extends AbstractGrailsTagTests {
+
+
+    void onInit() {
+        def mappingClass = gcl.parseClass('''
+class UrlMappings {
+    static mappings = {
+      "/authors" {
+              controller = "author"
+              action = "list"
+          }
+
+      "/content/$controller/$action?/$id?"{
+          constraints {
+             // apply constraints here
+          }
+      }
+    }
+}
+        ''')
+
+        grailsApplication.addArtefact(UrlMappingsArtefactHandler.TYPE, mappingClass)
+
+    }
+
+
+    void testSimpleLink() {
+        def expected = '<a href="/authors">link1</a>'
+        assertOutputEquals(expected, '<g:link controller="author" action="list">link1</g:link>')
+    }
+
+    void testLinkWithPaginationParams() {
+        def expected = '<a href="/authors?max=10&offset=20">link1</a>'
+        assertOutputEquals(expected, '<g:link controller="author" action="list" params="[max:10,offset:20]">link1</g:link>')
+    }
+}