Clear flash errors in case error action called directly

rundeck · Apr 23, 2011 · aa18e23 · aa18e23
1 parent 3c3fe4c
commit aa18e23
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/rundeckapp/grails-app/controllers/ApiController.groovy b/rundeckapp/grails-app/controllers/ApiController.groovy
@@ -49,8 +49,12 @@ class ApiController {
         return render(contentType:"text/xml",encoding:"UTF-8"){
             result(error:"true", apiversion:ApiRequestFilters.API_CURRENT_VERSION){
                 delegate.'error'{
+                    if (!flash.error && !flash.errors && !request.error && !request.errors) {
+                        message(g.message(code: "api.error.unknown"))
+                    }
                     if(flash.error){
                         message(flash.error)
+                        flash.error=null
                     }
                     if(request.error){
                         message(request.error)
@@ -59,15 +63,13 @@ class ApiController {
                         flash.errors.each{
                             message(it)
                         }
+                        flash.errors = null
                     }
                     if(request.errors){
                         request.errors.each{
                             message(it)
                         }
                     }
-                    if(!flash.error && !flash.errors && !request.error && !request.errors){
-                        message(g.message(code:"api.error.unknown"))
-                    }
                 }
             }
         }