Author: niallp
Date: Tue Feb 21 22:17:54 2006
New Revision: 379704
URL: http://svn.apache.org/viewcvs?rev=379704&view=rev
Log:
re: Bug 38374 - Change RequestProcessor to not throw InvalidCancelException if
validate="false" (this makes the RP conform to ComposableRequestProcessor
behaviour)
Modified:
struts/action/trunk/src/java/org/apache/struts/action/RequestProcessor.java
Modified:
struts/action/trunk/src/java/org/apache/struts/action/RequestProcessor.java
URL:
http://svn.apache.org/viewcvs/struts/action/trunk/src/java/org/apache/struts/action/RequestProcessor.java?rev=379704&r1=379703&r2=379704&view=diff
==============================================================================
--- struts/action/trunk/src/java/org/apache/struts/action/RequestProcessor.java
(original)
+++ struts/action/trunk/src/java/org/apache/struts/action/RequestProcessor.java
Tue Feb 21 22:17:54 2006
@@ -892,6 +892,11 @@
return (true);
}
+ // Has validation been turned off for this mapping?
+ if (!mapping.getValidate()) {
+ return (true);
+ }
+
// Was this request cancelled? If it has been, the mapping also
// needs to state whether the cancellation is permissable; otherwise
// the cancellation is considered to be a symptom of a programmer
@@ -906,12 +911,6 @@
request.removeAttribute(Globals.CANCEL_KEY);
throw new InvalidCancelException();
}
- }
-
-
- // Has validation been turned off for this mapping?
- if (!mapping.getValidate()) {
- return (true);
}
// Call the form bean's validation method
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
