Merge branch '2.3.x' into 2.4.x

lhotari · lhotari · commit c1f22169de9c · 2014-06-23T15:21:23.000+03:00
Conflicts:
	grails-web-gsp/src/main/groovy/org/codehaus/groovy/grails/web/servlet/view/GroovyPageViewResolver.java
diff --git a/grails-web-gsp/src/main/groovy/org/codehaus/groovy/grails/web/servlet/view/GroovyPageViewResolver.java b/grails-web-gsp/src/main/groovy/org/codehaus/groovy/grails/web/servlet/view/GroovyPageViewResolver.java
@@ -216,6 +216,12 @@ public void setCacheTimeout(long cacheTimeout) {
         this.cacheTimeout = cacheTimeout;
     }
 
+    @Override
+    public void clearCache() {
+        super.clearCache();
+        viewCache.clear();
+    }
+
     public boolean isAllowGrailsViewCaching() {
         return allowGrailsViewCaching;
     }

Original file line number	Diff line number	Diff line change
`@@ -216,6 +216,12 @@ public void setCacheTimeout(long cacheTimeout) {`
`216`	`216`	`this.cacheTimeout = cacheTimeout;`
`217`	`217`	`}`
`218`	`218`
	`219`	`+ @Override`
	`220`	`+ public void clearCache() {`
	`221`	`+ super.clearCache();`
	`222`	`+ viewCache.clear();`
	`223`	`+ }`
	`224`	`+`
`219`	`225`	`public boolean isAllowGrailsViewCaching() {`
`220`	`226`	`return allowGrailsViewCaching;`
`221`	`227`	`}`