From 9ddc1b8f5a88021dadad5984705d3edb0cf23230 Mon Sep 17 00:00:00 2001
From: James Kleeh <james.kleeh@gmail.com>
Date: Tue, 23 Aug 2016 13:47:35 -0400
Subject: [PATCH] Fix merge #2

---
 .../groovy/org/grails/web/mapping/CachingLinkGenerator.java   | 4 ----
 1 file changed, 4 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
index 564f168c54d..6ff8ad9bc8a 100644
--- 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
@@ -125,10 +125,6 @@ private void appendMapKey(StringBuilder buffer, Map map) {
                 if (value == null) continue;
                 first = appendCommaIfNotFirst(buffer, first);
                 Object key = entry.getKey();
-                if (UrlMapping.ACTION.equals(key) && map.get(UrlMapping.CONTROLLER) == null) {
-                    appendKeyValue(buffer, map, UrlMapping.CONTROLLER, getRequestStateLookupStrategy().getControllerName());
-                    appendCommaIfNotFirst(buffer, false);
-                }
                 if (RESOURCE_PREFIX.equals(key)) {
                     value = getCacheKeyValueForResource(value);
                 }