Merge branch '3.0.x' into 3.1.x

Author: graemerocher

grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/mvc/AbstractGrailsControllerUrlMappings.groovy

@@ -133,32 +133,58 @@ abstract class AbstractGrailsControllerUrlMappings implements UrlMappings{
         def namespace = hasUrlConverter ? urlConverter.toUrlElement( controller.namespace ) : controller.namespace
         def plugin = hasUrlConverter ? urlConverter.toUrlElement( controller.pluginName ) : controller.pluginName
         def controllerName = hasUrlConverter ? urlConverter.toUrlElement( controller.logicalPropertyName ) : controller.logicalPropertyName
+        String pluginNameToRegister = plugin ? GrailsNameUtils.getPropertyNameForLowerCaseHyphenSeparatedName(plugin) : null
+        final boolean hasNamespace = namespace == null
+        if(!hasNamespace) {
+            mappingsToGrailsControllerMap.put(new ControllerKey(namespace, controllerName, null, plugin), controller)
+            if(plugin) {
+                mappingsToGrailsControllerMap.put(new ControllerKey(namespace, controllerName, null, pluginNameToRegister), controller)
+                def controllerKeyWithoutPlugin = new ControllerKey(namespace, controllerName, null, null)
+                if(!mappingsToGrailsControllerMap.containsKey(controllerKeyWithoutPlugin)) {
+                    mappingsToGrailsControllerMap.put(controllerKeyWithoutPlugin, controller)
+                }
+            }
+        }
 
-        mappingsToGrailsControllerMap.put(new ControllerKey(namespace, controllerName, null, plugin), controller)
-        mappingsToGrailsControllerMap.put(new ControllerKey(null, controllerName, null, plugin), controller)
 
-        String pluginNameToRegister = plugin ? GrailsNameUtils.getPropertyNameForLowerCaseHyphenSeparatedName(plugin) : null
-        if(plugin) {
-            mappingsToGrailsControllerMap.put(new ControllerKey(namespace, controllerName, null, pluginNameToRegister), controller)
-            def controllerKeyWithoutPlugin = new ControllerKey(namespace, controllerName, null, null)
-            if(!mappingsToGrailsControllerMap.containsKey(controllerKeyWithoutPlugin)) {
-                mappingsToGrailsControllerMap.put(controllerKeyWithoutPlugin, controller)
-                mappingsToGrailsControllerMap.put(new ControllerKey(null, controllerName, null, null), controller)
+        def noNamespaceNoPluginKey = new ControllerKey(null, controllerName, null, null)
+        def noNamespaceDefaultActionKey = new ControllerKey(null, controllerName, null, plugin)
+
+
+        if(hasNamespace) {
+            mappingsToGrailsControllerMap.put(noNamespaceNoPluginKey, controller)
+            mappingsToGrailsControllerMap.put(noNamespaceDefaultActionKey, controller)
+        }
+        else {
+            if(!mappingsToGrailsControllerMap.containsKey(noNamespaceNoPluginKey)) {
+                mappingsToGrailsControllerMap.put(noNamespaceNoPluginKey, controller)
+            }
+            if(!mappingsToGrailsControllerMap.containsKey(noNamespaceDefaultActionKey)) {
+                mappingsToGrailsControllerMap.put(noNamespaceDefaultActionKey, controller)
             }
         }
 
+
+
+
+
         for(action in controller.actions) {
             action = hasUrlConverter ? urlConverter.toUrlElement(action) : action
             def withPluginKey = new ControllerKey(namespace, controllerName, action, pluginNameToRegister)
-            def withPluginKeyWithoutNamespaceKey = new ControllerKey(null, controllerName, action, pluginNameToRegister)
             def withoutPluginKey = new ControllerKey(namespace, controllerName, action, null)
+            def withPluginKeyWithoutNamespaceKey = new ControllerKey(null, controllerName, action, pluginNameToRegister)
             def withoutPluginKeyWithoutNamespace = new ControllerKey(null, controllerName, action, null)
+
             mappingsToGrailsControllerMap.put(withPluginKey, controller)
-            mappingsToGrailsControllerMap.put(withPluginKeyWithoutNamespaceKey, controller)
+            if(hasNamespace && !mappingsToGrailsControllerMap.containsKey(withPluginKeyWithoutNamespaceKey)) {
+                mappingsToGrailsControllerMap.put(withPluginKeyWithoutNamespaceKey, controller)
+            }
+
             if(plugin != null && !mappingsToGrailsControllerMap.containsKey(withoutPluginKey)) {
-                mappingsToGrailsControllerMap.put(new ControllerKey(namespace, controllerName, action, pluginNameToRegister), controller)
                 mappingsToGrailsControllerMap.put(withoutPluginKey, controller)
-                mappingsToGrailsControllerMap.put(withoutPluginKeyWithoutNamespace, controller)
+                if(hasNamespace && !mappingsToGrailsControllerMap.containsKey(withoutPluginKeyWithoutNamespace)) {
+                    mappingsToGrailsControllerMap.put(withoutPluginKeyWithoutNamespace, controller)
+                }
             }
         }
     }