Return-Path: Delivered-To: apmail-struts-commits-archive@locus.apache.org Received: (qmail 74703 invoked from network); 6 Dec 2007 06:49:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 6 Dec 2007 06:49:59 -0000 Received: (qmail 42755 invoked by uid 500); 6 Dec 2007 06:49:47 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 42720 invoked by uid 500); 6 Dec 2007 06:49:47 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 42711 invoked by uid 99); 6 Dec 2007 06:49:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 05 Dec 2007 22:49:46 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 06 Dec 2007 06:49:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C7C011A9832; Wed, 5 Dec 2007 22:49:26 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r601630 - in /struts/struts1/trunk/core/src/main/java/org/apache/struts: chain/commands/ExceptionCatcher.java config/impl/ModuleConfigImpl.java upload/CommonsMultipartRequestHandler.java validator/ValidatorForm.java Date: Thu, 06 Dec 2007 06:49:26 -0000 To: commits@struts.apache.org From: pbenedict@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071206064926.C7C011A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 =