1. opensymphony
  2. webwork

Commits

plightbo  committed b6cc09e

WW-666 (yikes!): ExecuteAndWaitInterceptor pushes the action to the stack

git-svn-id: http://svn.opensymphony.com/svn/webwork/trunk@583573baa09-0c28-0410-bef9-dab3c582ae83

  • Participants
  • Parent commits c9324d2
  • Branches master

Comments (0)

Files changed (1)

File src/java/com/opensymphony/webwork/interceptor/ExecuteAndWaitInterceptor.java

View file
  • Ignore whitespace
                 session.put(KEY + name, bp);
             }
 
-            if (!bp.done) {
+            if (!bp.isDone()) {
+                actionInvocation.getStack().push(bp.getAction());
                 return "wait";
             } else {
                 session.remove(KEY + name);
-                actionInvocation.getStack().push(bp.action);
+                actionInvocation.getStack().push(bp.getAction());
 
-                return bp.result;
+                return bp.getResult();
             }
         }
     }
 
     //~ Inner Classes //////////////////////////////////////////////////////////
 
-    class BackgroundProcess implements Serializable {
-        Action action;
-        ActionInvocation invocation;
-        String result;
-        boolean done;
+    static class BackgroundProcess implements Serializable {
+        private Action action;
+        private ActionInvocation invocation;
+        private String result;
+        private boolean done;
 
         public BackgroundProcess(final ActionInvocation invocation) {
             this.invocation = invocation;
             });
             t.start();
         }
+
+        public Action getAction() {
+            return action;
+        }
+
+        public String getResult() {
+            return result;
+        }
+
+        public boolean isDone() {
+            return done;
+        }
     }
 }