Return-Path: Delivered-To: apmail-struts-commits-archive@locus.apache.org Received: (qmail 33883 invoked from network); 4 Jul 2007 20:14:04 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 4 Jul 2007 20:14:04 -0000 Received: (qmail 3832 invoked by uid 500); 4 Jul 2007 20:14:04 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 3779 invoked by uid 500); 4 Jul 2007 20:14:04 -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 3761 invoked by uid 99); 4 Jul 2007 20:14:04 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 04 Jul 2007 13:14:04 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Wed, 04 Jul 2007 13:14:00 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 8E9FB1A981A; Wed, 4 Jul 2007 13:13:40 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r553322 - /struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java Date: Wed, 04 Jul 2007 20:13:40 -0000 To: commits@struts.apache.org From: pbenedict@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070704201340.8E9FB1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pbenedict Date: Wed Jul 4 13:13:39 2007 New Revision: 553322 URL: http://svn.apache.org/viewvc?view=rev&rev=553322 Log: STR-2700: Narrow the stream clearing to Windows only Modified: struts/struts1/trunk/core/src/main/java/org/apache/struts/upload/CommonsMultipartRequestHandler.java 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?view=diff&rev=553322&r1=553321&r2=553322 ============================================================================== --- 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 Jul 4 13:13:39 2007 @@ -275,12 +275,14 @@ */ protected void clearInputStream(HttpServletRequest request) { try { - ServletInputStream is = request.getInputStream(); - byte[] data = new byte[DEFAULT_SIZE_THRESHOLD]; - int bytesRead = 0; - do { - bytesRead = is.read(data); - } while (bytesRead > -1); + if (System.getProperty("os.name").contains("Windows")) { + ServletInputStream is = request.getInputStream(); + byte[] data = new byte[DEFAULT_SIZE_THRESHOLD]; + int bytesRead = 0; + do { + bytesRead = is.read(data); + } while (bytesRead > -1); + } } catch (Exception e) { log.error(e.getMessage(), e); }