Return-Path: X-Original-To: apmail-deltaspike-commits-archive@www.apache.org Delivered-To: apmail-deltaspike-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id D61351058E for ; Sat, 28 Dec 2013 15:13:45 +0000 (UTC) Received: (qmail 71171 invoked by uid 500); 28 Dec 2013 15:13:45 -0000 Delivered-To: apmail-deltaspike-commits-archive@deltaspike.apache.org Received: (qmail 71127 invoked by uid 500); 28 Dec 2013 15:13:44 -0000 Mailing-List: contact commits-help@deltaspike.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltaspike.apache.org Delivered-To: mailing list commits@deltaspike.apache.org Received: (qmail 71120 invoked by uid 99); 28 Dec 2013 15:13:44 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 28 Dec 2013 15:13:44 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 065898809F2; Sat, 28 Dec 2013 15:13:44 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: gpetracek@apache.org To: commits@deltaspike.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: DELTASPIKE-263 minor improvement Date: Sat, 28 Dec 2013 15:13:44 +0000 (UTC) Updated Branches: refs/heads/master 023de9212 -> bcf5909dc DELTASPIKE-263 minor improvement Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/bcf5909d Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/bcf5909d Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/bcf5909d Branch: refs/heads/master Commit: bcf5909dcf9e41dee7c73e9e12bf9d055f5cabf1 Parents: 023de92 Author: gpetracek Authored: Sat Dec 28 16:07:34 2013 +0100 Committer: gpetracek Committed: Sat Dec 28 16:10:57 2013 +0100 ---------------------------------------------------------------------- .../core/impl/resourceloader/ClasspathResourceProvider.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/bcf5909d/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ClasspathResourceProvider.java ---------------------------------------------------------------------- diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ClasspathResourceProvider.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ClasspathResourceProvider.java index 755534d..67f9d81 100644 --- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ClasspathResourceProvider.java +++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ClasspathResourceProvider.java @@ -71,11 +71,14 @@ public class ClasspathResourceProvider extends BaseResourceProvider { if (firstURL != null) { - if (result != null) + try { result.close(); } - is.close(); + finally + { + is.close(); + } throw new IllegalStateException("multiple files found for '" + name + "' (" + firstURL.toExternalForm() + ", " + url.toExternalForm() + ")"); }