fix for failing tests

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

Author: graeme

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

@@ -115,15 +115,24 @@ 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)) {
-            Set lookupParams = new HashSet(params.keySet());
-            lookupParams.addAll(DEFAULT_ACTION_PARAMS);
+            Set lookupParams = new HashSet(DEFAULT_ACTION_PARAMS);
+            Set paramKeys = params.keySet();
+            lookupParams.addAll(paramKeys);
             mapping = (UrlMapping)mappingsLookup.get(new UrlMappingKey(controller, null, lookupParams));
+            if(mapping == null) {
+                lookupParams.removeAll(paramKeys);
+                mapping = (UrlMapping)mappingsLookup.get(new UrlMappingKey(controller, null, lookupParams));
+            }
         }
         if(mapping == null || (mapping instanceof ResponseCodeUrlMapping)) {
-            Set lookupParams = new HashSet(params.keySet());
-            lookupParams.addAll(DEFAULT_CONTROLLER_PARAMS);
-
+            Set lookupParams = new HashSet(DEFAULT_CONTROLLER_PARAMS);
+            Set paramKeys = params.keySet();
+            lookupParams.addAll(paramKeys);
             mapping = (UrlMapping)mappingsLookup.get(new UrlMappingKey(null, null, lookupParams));
+            if(mapping == null) {
+                lookupParams.removeAll(paramKeys);
+                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/plugins/web/LoggingGrailsPluginTests.groovy

@@ -9,7 +9,7 @@ import org.apache.commons.logging.LogFactory
 import org.apache.commons.logging.impl.NoOpLog
 import org.codehaus.groovy.grails.commons.GrailsApplication
 
-class LoggingGrailsPluginTests extends AbstractGrailsPluginTests {
+class LoggingGrailsPluginTests extends AbstractGrailsPluginTests {   
 
     def controllerClass
     def serviceClass
@@ -57,6 +57,8 @@ class LoggingGrailsPluginTests extends AbstractGrailsPluginTests {
 	</context-param>
 </web-app>
 '''
+        System.setProperty('current.gant.script','')
+
         def xml = new XmlSlurper().parseText( xmlText  )
         System.setProperty(GrailsApplication.PROJECT_RESOURCES_DIR, "/test")
         def plugin = new LoggingGrailsPlugin()