Fix some tomcat issues

rundeck · Jul 25, 2012 · 366fd26 · 366fd26
1 parent 1119c94
commit 366fd26
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/rundeckapp/grails-app/controllers/ReportsController.groovy b/rundeckapp/grails-app/controllers/ReportsController.groovy
@@ -420,7 +420,8 @@ class ReportsController {
         //required parameters
         def missing= ['status','title','nodesuccesscount','nodefailcount','summary'].findAll{!params[it] }
         if(missing){
-            flash.errors=missing.collect{g.message(code:'api.error.parameter.required',args:[it])}
+            flash.errors=[]
+            flash.errors.addAll(missing.collect{g.message(code:'api.error.parameter.required',args:[it])})
             return chain(controller:'api',action:'error')
         }
 

diff --git a/test/api/rundecklogin.sh b/test/api/rundecklogin.sh
@@ -25,7 +25,12 @@ if [ -z "$RDAUTH" ] ; then
     RDUSER=${2:-"admin"}
     RDPASS=${3:-"admin"}
     echo "Login..."
-    $CURL -d j_username=$RDUSER -d j_password=$RDPASS $loginurl > $DIR/curl.out 
+    $CURL $url > $DIR/curl.out
+    if [ 0 != $? ] ; then
+        errorMsg "failed login request to ${loginurl}"
+        exit 2
+    fi
+    $CURL -X POST -d j_username=$RDUSER -d j_password=$RDPASS $loginurl > $DIR/curl.out
     if [ 0 != $? ] ; then
         errorMsg "failed login request to ${loginurl}"
         exit 2