fixed again. grailsWebRequest needs to go before the sitemesh filter

git-svn-id: https://svn.codehaus.org/grails/trunk@2974 1cfb16fd-6d17-0410-8ff1-b7e8e1e2867d

Author: graeme

src/groovy/org/codehaus/groovy/grails/web/plugins/ControllersGrailsPlugin.groovy

@@ -165,6 +165,7 @@ class ControllersGrailsPlugin {
 
 		def lastFilter = filters[filters.size()-1]
 		def lastFilterMapping = filterMappings[filterMappings.size()-1]
+		def charEncodingFilter = filterMappings.find { it.'filter-name'.text() == 'charEncodingFilter'}
 
 		// add the Grails web request filter
 		lastFilter + {
@@ -179,12 +180,18 @@ class ControllersGrailsPlugin {
 				}				
 			}			
 		}        
-		lastFilterMapping + {
+		def grailsWebRequestFilter = {
 			'filter-mapping' {						
 				'filter-name'('grailsWebRequest')
 				'url-pattern'("/*")						
 			}			
-		}		
+		}		                    
+		if(charEncodingFilter) {
+			charEncodingFilter + grailsWebRequestFilter
+		}                                              
+		else {
+			lastFilterMapping + grailsWebRequestFilter
+		}
 		// if we're in development environment first add a the reload filter
 		// to the web.xml by finding the last filter and appending it after		
 		if(grailsEnv == "development") {