Author: pbenedict
Date: Wed Dec 5 22:49:25 2007
New Revision: 601630
URL: http://svn.apache.org/viewvc?rev=601630&view=rev
Log:
STR-3118: Correct method usage to meet JDK 1.4 compliance
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/chain/commands/ExceptionCatcher.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/config/impl/ModuleConfigImpl.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorForm.java
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=601630&r1=601629&r2=601630&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
Wed Dec 5 22:49:25 2007
@@ -164,7 +164,7 @@
} catch (Exception e) {
LOG.warn("Exception from exceptionCommand '" + exceptionCommand
+ "'", e);
- throw new IllegalStateException("Exception chain threw exception",
e);
+ throw new IllegalStateException("Exception chain threw exception");
}
return (true);
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/config/impl/ModuleConfigImpl.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/config/impl/ModuleConfigImpl.java?rev=601630&r1=601629&r2=601630&view=diff
==============================================================================
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/config/impl/ModuleConfigImpl.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/config/impl/ModuleConfigImpl.java
Wed Dec 5 22:49:25 2007
@@ -721,7 +721,7 @@
if (Constants.STRUTS_URL_CASESENSITIVE.equals(key)) {
Map actionConfigs2;
- if (!Boolean.parseBoolean(value)) {
+ if (!Boolean.valueOf(value).booleanValue()) {
actionConfigs2 = new TreeMap(String.CASE_INSENSITIVE_ORDER);
} else {
actionConfigs2 = new HashMap();
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java?rev=601630&r1=601629&r2=601630&view=diff
==============================================================================
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java
Wed Dec 5 22:49:25 2007
@@ -275,7 +275,7 @@
*/
protected void clearInputStream(HttpServletRequest request) {
try {
- if (System.getProperty("os.name").contains("Windows")) {
+ if (System.getProperty("os.name").indexOf("Windows") >= -1) {
ServletInputStream is = request.getInputStream();
byte[] data = new byte[DEFAULT_SIZE_THRESHOLD];
int bytesRead = 0;
Modified:
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorForm.java
URL:
http://svn.apache.org/viewvc/struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorForm.java?rev=601630&r1=601629&r2=601630&view=diff
==============================================================================
---
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorForm.java
(original)
+++
struts/struts1/trunk/core/src/main/java/org/apache/struts/validator/ValidatorForm.java
Wed Dec 5 22:49:25 2007
@@ -114,7 +114,7 @@
throw new IllegalStateException(
"Missing ActionServlet instance for bean '" +
mapping.getName() +
- "' (created outside of Struts?)", e);
+ "' (created outside of Struts?)");
}
Validator validator =
