Return-Path: X-Original-To: apmail-logging-commits-archive@minotaur.apache.org Delivered-To: apmail-logging-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id CFEB010BB8 for ; Wed, 26 Mar 2014 20:31:50 +0000 (UTC) Received: (qmail 2896 invoked by uid 500); 26 Mar 2014 20:31:49 -0000 Delivered-To: apmail-logging-commits-archive@logging.apache.org Received: (qmail 2866 invoked by uid 500); 26 Mar 2014 20:31:49 -0000 Mailing-List: contact commits-help@logging.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@logging.apache.org Delivered-To: mailing list commits@logging.apache.org Received: (qmail 2856 invoked by uid 99); 26 Mar 2014 20:31:49 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 26 Mar 2014 20:31:49 +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; Wed, 26 Mar 2014 20:31:48 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 14C5123888D7; Wed, 26 Mar 2014 20:31:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1582040 - /logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JSONConfiguration.java Date: Wed, 26 Mar 2014 20:31:28 -0000 To: commits@logging.apache.org From: ggregory@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140326203128.14C5123888D7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ggregory Date: Wed Mar 26 20:31:27 2014 New Revision: 1582040 URL: http://svn.apache.org/r1582040 Log: Bullet-proofing. Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JSONConfiguration.java Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JSONConfiguration.java URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JSONConfiguration.java?rev=1582040&r1=1582039&r2=1582040&view=diff ============================================================================== --- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JSONConfiguration.java (original) +++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/config/json/JSONConfiguration.java Wed Mar 26 20:31:27 2014 @@ -56,10 +56,14 @@ public class JSONConfiguration extends A public JSONConfiguration(final ConfigurationFactory.ConfigurationSource configSource) { this.configFile = configSource.getFile(); + byte[] buffer; try { final InputStream configStream = configSource.getInputStream(); - byte[] buffer = toByteArray(configStream); - configStream.close(); + try { + buffer = toByteArray(configStream); + } finally { + configStream.close(); + } final InputStream is = new ByteArrayInputStream(buffer); root = getObjectMapper().readTree(is); if (root.size() == 1) {