Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 83087 invoked from network); 16 Aug 2010 22:21:01 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 16 Aug 2010 22:21:01 -0000 Received: (qmail 73177 invoked by uid 500); 16 Aug 2010 22:21:01 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 73151 invoked by uid 500); 16 Aug 2010 22:21:01 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 73144 invoked by uid 99); 16 Aug 2010 22:21:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Aug 2010 22:21:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 16 Aug 2010 22:21:01 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 35CB62388A1C; Mon, 16 Aug 2010 22:19:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r986141 - /harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java Date: Mon, 16 Aug 2010 22:19:44 -0000 To: commits@harmony.apache.org From: hindessm@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100816221944.35CB62388A1C@eris.apache.org> Author: hindessm Date: Mon Aug 16 22:19:43 2010 New Revision: 986141 URL: http://svn.apache.org/viewvc?rev=986141&view=rev Log: Applying patch from "[#HARMONY-6609] use cache in createImageInputStream() & createImageOutputStream". Modified: harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java Modified: harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java?rev=986141&r1=986140&r2=986141&view=diff ============================================================================== --- harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java (original) +++ harmony/enhanced/java/trunk/classlib/modules/imageio/src/main/java/javax/imageio/ImageIO.java Mon Aug 16 22:19:43 2010 @@ -76,7 +76,9 @@ public final class ImageIO { while (it.hasNext()) { ImageInputStreamSpi spi = it.next(); if (spi.getInputClass().isInstance(input)) { - return spi.createInputStreamInstance(input); + return getUseCache() ? + spi.createInputStreamInstance(input, true, getCacheDirectory()) : + spi.createInputStreamInstance(input); } } return null; @@ -93,8 +95,9 @@ public final class ImageIO { while (it.hasNext()) { ImageOutputStreamSpi spi = it.next(); if (spi.getOutputClass().isInstance(output)) { - // todo - use getUseCache and getCacheDir here - return spi.createOutputStreamInstance(output); + return getUseCache() ? + spi.createOutputStreamInstance(output, true, getCacheDirectory()) : + spi.createOutputStreamInstance(output); } } return null;