You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2014/07/01 03:34:25 UTC
git commit: Close InputStream after use
Repository: jclouds
Updated Branches:
refs/heads/master eb884e7c0 -> 77eff6fff
Close InputStream after use
Found with Kohsuke's file-leak-detector.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/77eff6ff
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/77eff6ff
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/77eff6ff
Branch: refs/heads/master
Commit: 77eff6fffb2d4687b3c8808f60a26ab025751d09
Parents: eb884e7
Author: Andrew Gaul <ga...@apache.org>
Authored: Mon Jun 30 18:26:55 2014 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Mon Jun 30 18:26:55 2014 -0700
----------------------------------------------------------------------
core/src/main/java/org/jclouds/JcloudsVersion.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/77eff6ff/core/src/main/java/org/jclouds/JcloudsVersion.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/JcloudsVersion.java b/core/src/main/java/org/jclouds/JcloudsVersion.java
index c220dae..29d70c4 100644
--- a/core/src/main/java/org/jclouds/JcloudsVersion.java
+++ b/core/src/main/java/org/jclouds/JcloudsVersion.java
@@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static java.lang.String.format;
+import java.io.InputStream;
import java.io.IOException;
import java.util.Properties;
import java.util.regex.Matcher;
@@ -28,6 +29,7 @@ import java.util.regex.Pattern;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.io.Closeables;
public class JcloudsVersion {
@VisibleForTesting
@@ -82,10 +84,13 @@ public class JcloudsVersion {
private static String readVersionPropertyFromClasspath(ClassLoader resourceLoader) {
Properties versionProperties = new Properties();
+ InputStream is = checkNotNull(resourceLoader.getResourceAsStream(VERSION_RESOURCE_FILE), VERSION_RESOURCE_FILE);
try {
- versionProperties.load(checkNotNull(resourceLoader.getResourceAsStream(VERSION_RESOURCE_FILE), VERSION_RESOURCE_FILE));
+ versionProperties.load(is);
} catch (IOException exception) {
throw new IllegalStateException(format("Unable to load version resource file '%s'", VERSION_RESOURCE_FILE), exception);
+ } finally {
+ Closeables.closeQuietly(is);
}
return checkNotNull(versionProperties.getProperty(VERSION_PROPERTY_NAME), VERSION_PROPERTY_NAME);
}