STR-3150: Use Chain processing constants on trunk
git-svn-id: https://svn.apache.org/repos/asf/struts/struts1/trunk@721970 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java b/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java
index 42c4dba..cb3c594 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/AbstractAuthorizeAction.java
@@ -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;
}
}
diff --git a/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java b/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java
index 49dcc87..8ae7ba5 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/AbstractCreateAction.java
@@ -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
diff --git a/core/src/main/java/org/apache/struts/chain/commands/AbstractExceptionHandler.java b/core/src/main/java/org/apache/struts/chain/commands/AbstractExceptionHandler.java
index 2fe293f..2882ffc 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/AbstractExceptionHandler.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/AbstractExceptionHandler.java
@@ -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;
}
}
diff --git a/core/src/main/java/org/apache/struts/chain/commands/AbstractExecuteAction.java b/core/src/main/java/org/apache/struts/chain/commands/AbstractExecuteAction.java
index 501b0ec..dfbeafe 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/AbstractExecuteAction.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/AbstractExecuteAction.java
@@ -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
diff --git a/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformForward.java b/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformForward.java
index 4466028..183fc6e 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformForward.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformForward.java
@@ -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
diff --git a/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformInclude.java b/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformInclude.java
index 9764aa7..971a56d 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformInclude.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/AbstractPerformInclude.java
@@ -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
diff --git a/core/src/main/java/org/apache/struts/chain/commands/AbstractPopulateActionForm.java b/core/src/main/java/org/apache/struts/chain/commands/AbstractPopulateActionForm.java
index 21ed860..b5fd37a 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/AbstractPopulateActionForm.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/AbstractPopulateActionForm.java
@@ -78,7 +78,7 @@
populate(actionCtx, actionConfig, actionForm);
}
- return (false);
+ return CONTINUE_PROCESSING;
}
// ------------------------------------------------------- Protected Methods
diff --git a/core/src/main/java/org/apache/struts/chain/commands/AbstractRequestNoCache.java b/core/src/main/java/org/apache/struts/chain/commands/AbstractRequestNoCache.java
index d6294bd..e820a1a 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/AbstractRequestNoCache.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/AbstractRequestNoCache.java
@@ -51,7 +51,7 @@
requestNoCache(actionCtx);
}
- return (false);
+ return CONTINUE_PROCESSING;
}
// ------------------------------------------------------- Protected Methods
diff --git a/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectAction.java b/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectAction.java
index f9ad3c2..fd81d77 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectAction.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectAction.java
@@ -74,7 +74,7 @@
actionCtx.setActionConfig(actionConfig);
- return (false);
+ return CONTINUE_PROCESSING;
}
// ------------------------------------------------------- Protected Methods
diff --git a/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectForward.java b/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectForward.java
index a932c03..1a3a242 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectForward.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectForward.java
@@ -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
diff --git a/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java b/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java
index cfafc9f..2d68edf 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectInput.java
@@ -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
diff --git a/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectLocale.java b/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectLocale.java
index 2108c1c..ad15265 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectLocale.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectLocale.java
@@ -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
diff --git a/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectModule.java b/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectModule.java
index 7d7031a..0cfffbd 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectModule.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/AbstractSelectModule.java
@@ -76,7 +76,7 @@
actionCtx.setMessageResources(messageResources);
- return (false);
+ return CONTINUE_PROCESSING;
}
// ------------------------------------------------------- Protected Methods
diff --git a/core/src/main/java/org/apache/struts/chain/commands/AbstractSetContentType.java b/core/src/main/java/org/apache/struts/chain/commands/AbstractSetContentType.java
index 823da4c..a83120a 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/AbstractSetContentType.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/AbstractSetContentType.java
@@ -54,7 +54,7 @@
setContentType(actionCtx, contentType);
}
- return (false);
+ return CONTINUE_PROCESSING;
}
// ------------------------------------------------------- Protected Methods
diff --git a/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java b/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java
index 18ead41..a0dacbc 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/AbstractSetOriginalURI.java
@@ -47,7 +47,7 @@
setOriginalURI(actionCtx);
}
- return (false);
+ return CONTINUE_PROCESSING;
}
// ------------------------------------------------------- Protected Methods
diff --git a/core/src/main/java/org/apache/struts/chain/commands/AbstractValidateActionForm.java b/core/src/main/java/org/apache/struts/chain/commands/AbstractValidateActionForm.java
index 21a05a4..d54be74 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/AbstractValidateActionForm.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/AbstractValidateActionForm.java
@@ -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
diff --git a/core/src/main/java/org/apache/struts/chain/commands/CacheMessages.java b/core/src/main/java/org/apache/struts/chain/commands/CacheMessages.java
index 9462acf..33a4f9b 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/CacheMessages.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/CacheMessages.java
@@ -50,7 +50,7 @@
copyUnaccessedMessages(request, session, Globals.ERROR_KEY);
}
- return false;
+ return CONTINUE_PROCESSING;
}
/**
diff --git a/core/src/main/java/org/apache/struts/chain/commands/CreateActionForm.java b/core/src/main/java/org/apache/struts/chain/commands/CreateActionForm.java
index 773c771..82e8ad3 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/CreateActionForm.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/CreateActionForm.java
@@ -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;
}
}
diff --git a/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java b/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
index 1ca0268..9b7769a 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
@@ -113,7 +113,7 @@
throws Exception {
actionCtx.setException(null);
- return (false);
+ return CONTINUE_PROCESSING;
}
/**
diff --git a/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java b/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java
index 190581d..32a3c3d 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/ExecuteCommand.java
@@ -71,7 +71,7 @@
}
}
- return (false);
+ return CONTINUE_PROCESSING;
}
/**
diff --git a/core/src/main/java/org/apache/struts/chain/commands/ExecuteDispatcher.java b/core/src/main/java/org/apache/struts/chain/commands/ExecuteDispatcher.java
index 4676e93..347f7fc 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/ExecuteDispatcher.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/ExecuteDispatcher.java
@@ -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
diff --git a/core/src/main/java/org/apache/struts/chain/commands/RemoveCachedMessages.java b/core/src/main/java/org/apache/struts/chain/commands/RemoveCachedMessages.java
index 7efaeb0..c7ba174 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/RemoveCachedMessages.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/RemoveCachedMessages.java
@@ -57,7 +57,7 @@
// Remove error messages as needed
removeAccessedMessages(session, Globals.ERROR_KEY);
- return false;
+ return CONTINUE_PROCESSING;
}
/**
diff --git a/core/src/main/java/org/apache/struts/chain/commands/SelectInclude.java b/core/src/main/java/org/apache/struts/chain/commands/SelectInclude.java
index edc0b63..a5d05e0 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/SelectInclude.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/SelectInclude.java
@@ -66,6 +66,6 @@
actionCtx.setInclude(include);
}
- return (false);
+ return CONTINUE_PROCESSING;
}
}
diff --git a/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java b/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java
index 26b5efa..2e0e328 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/generic/WrappingLookupCommand.java
@@ -189,7 +189,7 @@
if (command != null) {
return command.execute(getContext(context));
} else {
- return false;
+ return CONTINUE_PROCESSING;
}
}
diff --git a/core/src/main/java/org/apache/struts/chain/commands/servlet/ActionPostProcess.java b/core/src/main/java/org/apache/struts/chain/commands/servlet/ActionPostProcess.java
index ebe0c4d..3fc56a6 100644
--- a/core/src/main/java/org/apache/struts/chain/commands/servlet/ActionPostProcess.java
+++ b/core/src/main/java/org/apache/struts/chain/commands/servlet/ActionPostProcess.java
@@ -50,6 +50,6 @@
request.setAttribute(Globals.CHAIN_KEY, Boolean.TRUE);
// Continue chain processing
- return false;
+ return CONTINUE_PROCESSING;
}
}
