Fix merge

grails · Aug 23, 2016 · 13168cf · 13168cf
1 parent 518a31f
commit 13168cf
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/CachingLinkGenerator.java b/grails-web-url-mappings/src/main/groovy/org/grails/web/mapping/CachingLinkGenerator.java
@@ -134,13 +134,6 @@ private void appendMapKey(StringBuilder buffer, Map map) {
                 }
                 appendKeyValue(buffer, map, key, value);
             }
-            if (map.get(UrlMapping.NAMESPACE) == null) {
-                String namespace = getRequestStateLookupStrategy().getControllerNamespace();
-                if (GrailsStringUtils.isNotEmpty(namespace)) {
-                    appendCommaIfNotFirst(buffer, first);
-                    appendKeyValue(buffer, map, UrlMapping.NAMESPACE, namespace);
-                }
-            }
         }
         buffer.append(CLOSING_BRACKET);
     }