Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D365D1028F for ; Tue, 4 Jun 2013 12:25:05 +0000 (UTC) Received: (qmail 37846 invoked by uid 500); 4 Jun 2013 12:25:05 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 37640 invoked by uid 500); 4 Jun 2013 12:25:04 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 37631 invoked by uid 99); 4 Jun 2013 12:25:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 12:25:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Tue, 04 Jun 2013 12:25:02 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 1845D2388847 for ; Tue, 4 Jun 2013 12:24:42 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1489408 - /tomcat/tc7.0.x/trunk/java/org/apache/juli/FileHandler.java Date: Tue, 04 Jun 2013 12:24:42 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130604122442.1845D2388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Tue Jun 4 12:24:41 2013 New Revision: 1489408 URL: http://svn.apache.org/r1489408 Log: Silence some Eclipse warnings Modified: tomcat/tc7.0.x/trunk/java/org/apache/juli/FileHandler.java Modified: tomcat/tc7.0.x/trunk/java/org/apache/juli/FileHandler.java URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/juli/FileHandler.java?rev=1489408&r1=1489407&r2=1489408&view=diff ============================================================================== --- tomcat/tc7.0.x/trunk/java/org/apache/juli/FileHandler.java (original) +++ tomcat/tc7.0.x/trunk/java/org/apache/juli/FileHandler.java Tue Jun 4 12:24:41 2013 @@ -21,6 +21,7 @@ package org.apache.juli; import java.io.BufferedOutputStream; import java.io.File; import java.io.FileOutputStream; +import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.PrintWriter; @@ -372,7 +373,8 @@ public class FileHandler // Open the current log file writerLock.writeLock().lock(); - try { + FileOutputStream fos = null; + OutputStream os = null; try { File pathname = new File(dir.getAbsoluteFile(), prefix + (rotatable ? date : "") + suffix); File parent = pathname.getParentFile(); @@ -383,8 +385,8 @@ public class FileHandler return; } String encoding = getEncoding(); - FileOutputStream fos = new FileOutputStream(pathname, true); - OutputStream os = bufferSize>0?new BufferedOutputStream(fos,bufferSize):fos; + fos = new FileOutputStream(pathname, true); + os = bufferSize>0?new BufferedOutputStream(fos,bufferSize):fos; writer = new PrintWriter( (encoding != null) ? new OutputStreamWriter(os, encoding) : new OutputStreamWriter(os), false); @@ -392,6 +394,20 @@ public class FileHandler } catch (Exception e) { reportError(null, e, ErrorManager.OPEN_FAILURE); writer = null; + if (fos != null) { + try { + fos.close(); + } catch (IOException e1) { + // Ignore + } + } + if (os != null) { + try { + os.close(); + } catch (IOException e1) { + // Ignore + } + } } finally { writerLock.writeLock().unlock(); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org