Merge branch '3.0.x'

Author: graemerocher

grails-web-common/src/main/groovy/org/grails/web/pages/GroovyPagesUriSupport.java

@@ -75,13 +75,20 @@ public String getNoSuffixViewURI(GroovyObject controller, String viewName) {
     }
 
     public String getLogicalControllerName(GroovyObject controller) {
-        if(controller != null) {
-            return GrailsNameUtils.getLogicalPropertyName(controller.getClass().getSimpleName(), ControllerArtefactHandler.TYPE);
-        }
-        else {
+        if(controller == null) {
             GrailsWebRequest webRequest = GrailsWebRequest.lookup();
             return webRequest != null ? webRequest.getControllerName() : null;
         }
+        else {
+            String simpleName = controller.getClass().getSimpleName();
+            if(!simpleName.endsWith(ControllerArtefactHandler.TYPE)) {
+                GrailsWebRequest webRequest = GrailsWebRequest.lookup();
+                return webRequest != null ? webRequest.getControllerName() : null;
+            }
+            else {
+                return GrailsNameUtils.getLogicalPropertyName(simpleName, ControllerArtefactHandler.TYPE);
+            }
+        }
     }
 
     /**