struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pbened...@apache.org
Subject svn commit: r721970 - in /struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands: ./ generic/ servlet/
Date Mon, 01 Dec 2008 05:40:51 GMT
Author: pbenedict
Date: Sun Nov 30 21:40:50 2008
New Revision: 721970

URL: http://svn.apache.org/viewvc?rev=721970&view=rev
Log:
STR-3150: Use Chain processing constants on trunk

Modified:
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractExceptionHandler.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractExecuteAction.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformForward.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformInclude.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPopulateActionForm.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractRequestNoCache.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectAction.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectForward.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectLocale.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectModule.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetContentType.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractValidateActionForm.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/CacheMessages.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/CreateActionForm.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteDispatcher.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/RemoveCachedMessages.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/SelectInclude.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java
    struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/ActionPostProcess.java

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java
Sun Nov 30 21:40:50 2008
@@ -62,7 +62,7 @@
 
         // Is this action protected by role requirements?
         if (!isAuthorizationRequired(actionConfig)) {
-            return (false);
+            return CONTINUE_PROCESSING;
         }
 
         boolean throwEx;
@@ -83,7 +83,7 @@
             throw new UnauthorizedActionException(getErrorMessage(actionCtx,
                     actionConfig));
         } else {
-            return (false);
+            return CONTINUE_PROCESSING;
         }
     }
 

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java
Sun Nov 30 21:40:50 2008
@@ -61,14 +61,14 @@
         if ((valid == null) || !valid.booleanValue()) {
             LOG.trace("Invalid form; not going to execute.");
 
-            return (false);
+            return CONTINUE_PROCESSING;
         }
 
         // Check to see if an action has already been created
         if (actionCtx.getAction() != null) {
             LOG.trace("already have an action [" + actionCtx.getAction() + "]");
 
-            return (false);
+            return CONTINUE_PROCESSING;
         }
 
         // Look up the class name for the desired Action
@@ -84,7 +84,7 @@
                 LOG.trace("no type for " + actionConfig.getPath());
             }
 
-            return (false);
+            return CONTINUE_PROCESSING;
         }
 
         // Create (if necessary) and cache an Action instance
@@ -96,7 +96,7 @@
 
         actionCtx.setAction(action);
 
-        return (false);
+        return CONTINUE_PROCESSING;
     }
 
     // ------------------------------------------------------- Protected Methods

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractExceptionHandler.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractExceptionHandler.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractExceptionHandler.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractExceptionHandler.java
Sun Nov 30 21:40:50 2008
@@ -64,7 +64,7 @@
         if (exception == null) {
             LOG.warn("No Exception found in ActionContext");
 
-            return (true);
+            return PROCESSING_COMPLETE;
         }
 
         // Look up the local or global exception handler configuration
@@ -103,9 +103,9 @@
         if (forwardConfig != null) {
             actionCtx.setForwardConfig(forwardConfig);
 
-            return (false);
+            return CONTINUE_PROCESSING;
         } else {
-            return (true);
+            return PROCESSING_COMPLETE;
         }
     }
 

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractExecuteAction.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractExecuteAction.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractExecuteAction.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractExecuteAction.java
Sun Nov 30 21:40:50 2008
@@ -52,19 +52,19 @@
         // Skip processing if the current request is not valid
         Boolean valid = actionCtx.getFormValid();
         if ((valid == null) || !valid.booleanValue()) {
-            return (false);
+            return CONTINUE_PROCESSING;
         }
         
         // Skip processing if a dispatcher is available
         ActionConfig actionConfig = actionCtx.getActionConfig();
         if (actionConfig.getDispatcher() != null) {
-            return false;
+            return CONTINUE_PROCESSING;
         }
 
         // Acquire the resources we will need to send to the Action
         Action action = actionCtx.getAction();
         if (action == null) {
-            return (false);
+            return CONTINUE_PROCESSING;
         }
 
         ActionForm actionForm = actionCtx.getActionForm();
@@ -75,7 +75,7 @@
 
         actionCtx.setForwardConfig(forwardConfig);
 
-        return (false);
+        return CONTINUE_PROCESSING;
     }
 
     // ------------------------------------------------------- Protected Methods

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformForward.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformForward.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformForward.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformForward.java
Sun Nov 30 21:40:50 2008
@@ -47,13 +47,13 @@
         ForwardConfig forwardConfig = actionCtx.getForwardConfig();
 
         if (forwardConfig == null) {
-            return (false);
+            return CONTINUE_PROCESSING;
         }
 
         // Perform the appropriate processing on this ActionForward
         perform(actionCtx, forwardConfig);
 
-        return (true);
+        return PROCESSING_COMPLETE;
     }
 
     // ------------------------------------------------------- Protected Methods

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformInclude.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformInclude.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformInclude.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformInclude.java
Sun Nov 30 21:40:50 2008
@@ -47,7 +47,7 @@
         String include = actionCtx.getInclude();
 
         if (include == null) {
-            return (false);
+            return CONTINUE_PROCESSING;
         }
 
         // Determine the currect uri
@@ -56,7 +56,7 @@
         // Perform the appropriate processing on this include uri
         perform(actionCtx, uri);
 
-        return (true);
+        return PROCESSING_COMPLETE;
     }
 
     // ------------------------------------------------------- Protected Methods

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPopulateActionForm.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPopulateActionForm.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPopulateActionForm.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractPopulateActionForm.java
Sun Nov 30 21:40:50 2008
@@ -78,7 +78,7 @@
             populate(actionCtx, actionConfig, actionForm);
         }
 
-        return (false);
+        return CONTINUE_PROCESSING;
     }
 
     // ------------------------------------------------------- Protected Methods

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractRequestNoCache.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractRequestNoCache.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractRequestNoCache.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractRequestNoCache.java
Sun Nov 30 21:40:50 2008
@@ -51,7 +51,7 @@
             requestNoCache(actionCtx);
         }
 
-        return (false);
+        return CONTINUE_PROCESSING;
     }
 
     // ------------------------------------------------------- Protected Methods

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectAction.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectAction.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectAction.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectAction.java
Sun Nov 30 21:40:50 2008
@@ -74,7 +74,7 @@
 
         actionCtx.setActionConfig(actionConfig);
 
-        return (false);
+        return CONTINUE_PROCESSING;
     }
 
     // ------------------------------------------------------- Protected Methods

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectForward.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectForward.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectForward.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectForward.java
Sun Nov 30 21:40:50 2008
@@ -59,7 +59,7 @@
         Boolean valid = actionCtx.getFormValid();
 
         if ((valid == null) || !valid.booleanValue()) {
-            return (false);
+            return CONTINUE_PROCESSING;
         }
 
         // Acquire configuration objects that we need
@@ -79,7 +79,7 @@
             actionCtx.setForwardConfig(forwardConfig);
         }
 
-        return (false);
+        return CONTINUE_PROCESSING;
     }
 
     // ------------------------------------------------------- Protected Methods

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java
Sun Nov 30 21:40:50 2008
@@ -59,7 +59,7 @@
         Boolean valid = actionCtx.getFormValid();
 
         if ((valid != null) && valid.booleanValue()) {
-            return (false);
+            return CONTINUE_PROCESSING;
         }
 
         // Acquire configuration objects that we need
@@ -91,7 +91,7 @@
         
         actionCtx.setForwardConfig(forwardConfig);
 
-        return (false);
+        return CONTINUE_PROCESSING;
     }
 
     // ------------------------------------------------------- Protected Methods

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectLocale.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectLocale.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectLocale.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectLocale.java
Sun Nov 30 21:40:50 2008
@@ -64,7 +64,7 @@
                     + "nothing to do");
             }
 
-            return (false);
+            return CONTINUE_PROCESSING;
         }
 
         // Retrieve and cache appropriate Locale for this request
@@ -76,7 +76,7 @@
 
         actionCtx.setLocale(locale);
 
-        return (false);
+        return CONTINUE_PROCESSING;
     }
 
     // ------------------------------------------------------- Protected Methods

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectModule.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectModule.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectModule.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectModule.java
Sun Nov 30 21:40:50 2008
@@ -76,7 +76,7 @@
 
         actionCtx.setMessageResources(messageResources);
 
-        return (false);
+        return CONTINUE_PROCESSING;
     }
 
     // ------------------------------------------------------- Protected Methods

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetContentType.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetContentType.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetContentType.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetContentType.java
Sun Nov 30 21:40:50 2008
@@ -54,7 +54,7 @@
             setContentType(actionCtx, contentType);
         }
 
-        return (false);
+        return CONTINUE_PROCESSING;
     }
 
     // ------------------------------------------------------- Protected Methods

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java
Sun Nov 30 21:40:50 2008
@@ -47,7 +47,7 @@
             setOriginalURI(actionCtx);
         }
 
-        return (false);
+        return CONTINUE_PROCESSING;
     }
 
     // ------------------------------------------------------- Protected Methods

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractValidateActionForm.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractValidateActionForm.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractValidateActionForm.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/AbstractValidateActionForm.java
Sun Nov 30 21:40:50 2008
@@ -97,23 +97,22 @@
         ActionForm actionForm = actionCtx.getActionForm();
 
         if (actionForm == null) {
-            return false;
+            return CONTINUE_PROCESSING;
         }
 
         // Is validation disabled on this request?
         ActionConfig actionConfig = actionCtx.getActionConfig();
 
         if (!actionConfig.getValidate()) {
-            return false;
+            return CONTINUE_PROCESSING;
         }
 
         // Was this request cancelled?
         if (isCancelled(actionCtx, actionConfig)) {
             if (LOG.isDebugEnabled()) {
-                LOG.debug(" Cancelled transaction, skipping validation");
+                LOG.debug("Cancelled transaction, skipping validation");
             }
-
-            return false;
+            return CONTINUE_PROCESSING;
         }
 
         // Call the validate() method of this form bean
@@ -121,7 +120,7 @@
 
         // If there were no errors, proceed normally
         if ((errors == null) || (errors.isEmpty())) {
-            return false;
+            return CONTINUE_PROCESSING;
         }
 
         // Flag the validation failure and proceed
@@ -131,7 +130,7 @@
         actionCtx.saveErrors(errors);
         actionCtx.setFormValid(Boolean.FALSE);
 
-        return false;
+        return CONTINUE_PROCESSING;
     }
 
     // ------------------------------------------------------- Protected Methods

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/CacheMessages.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/CacheMessages.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/CacheMessages.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/CacheMessages.java
Sun Nov 30 21:40:50 2008
@@ -50,7 +50,7 @@
             copyUnaccessedMessages(request, session, Globals.ERROR_KEY);
         }
 
-        return false;
+        return CONTINUE_PROCESSING;
     }
 
     /**

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/CreateActionForm.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/CreateActionForm.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/CreateActionForm.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/CreateActionForm.java
Sun Nov 30 21:40:50 2008
@@ -60,8 +60,7 @@
 
         if (name == null) {
             actionCtx.setActionForm(null);
-
-            return (false);
+            return CONTINUE_PROCESSING;
         }
 
         if (LOG.isTraceEnabled()) {
@@ -77,8 +76,7 @@
                 + actionConfig.getModuleConfig().getPrefix() + " under name "
                 + name);
             actionCtx.setActionForm(null);
-
-            return (false);
+            return CONTINUE_PROCESSING;
         }
 
         Map scope = actionCtx.getScope(actionConfig.getScope());
@@ -107,6 +105,6 @@
 
         scope.put(actionConfig.getAttribute(), instance);
 
-        return (false);
+        return CONTINUE_PROCESSING;
     }
 }

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
Sun Nov 30 21:40:50 2008
@@ -113,7 +113,7 @@
         throws Exception {
         actionCtx.setException(null);
 
-        return (false);
+        return CONTINUE_PROCESSING;
     }
 
     /**

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java
Sun Nov 30 21:40:50 2008
@@ -71,7 +71,7 @@
             }
         }
 
-        return (false);
+        return CONTINUE_PROCESSING;
     }
 
     /**

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteDispatcher.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteDispatcher.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteDispatcher.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExecuteDispatcher.java
Sun Nov 30 21:40:50 2008
@@ -58,7 +58,7 @@
 	// Skip processing if the current request is not valid
 	Boolean valid = context.getFormValid();
 	if ((valid == null) || !valid.booleanValue()) {
-	    return (false);
+	    return CONTINUE_PROCESSING;
 	}
 
 	// If no dispatcher, skip

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/RemoveCachedMessages.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/RemoveCachedMessages.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/RemoveCachedMessages.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/RemoveCachedMessages.java
Sun Nov 30 21:40:50 2008
@@ -57,7 +57,7 @@
         // Remove error messages as needed
         removeAccessedMessages(session, Globals.ERROR_KEY);
 
-        return false;
+        return CONTINUE_PROCESSING;
     }
 
     /**

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/SelectInclude.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/SelectInclude.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/SelectInclude.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/SelectInclude.java
Sun Nov 30 21:40:50 2008
@@ -66,6 +66,6 @@
             actionCtx.setInclude(include);
         }
 
-        return (false);
+        return CONTINUE_PROCESSING;
     }
 }

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java
Sun Nov 30 21:40:50 2008
@@ -189,7 +189,7 @@
         if (command != null) {
             return command.execute(getContext(context));
         } else {
-            return false;
+            return CONTINUE_PROCESSING;
         }
     }
 

Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/ActionPostProcess.java
URL: http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/ActionPostProcess.java?rev=721970&r1=721969&r2=721970&view=diff
==============================================================================
--- struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/ActionPostProcess.java
(original)
+++ struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/servlet/ActionPostProcess.java
Sun Nov 30 21:40:50 2008
@@ -50,6 +50,6 @@
         request.setAttribute(Globals.CHAIN_KEY, Boolean.TRUE);
 
         // Continue chain processing
-        return false;
+        return CONTINUE_PROCESSING;
     }
 }



Mime
View raw message