You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tamaya.apache.org by pl...@apache.org on 2015/02/10 07:35:19 UTC
[5/9] incubator-tamaya git commit: TAMAYA-53 ResourceResolver now
closes always it's used resources.
TAMAYA-53 ResourceResolver now closes always it's used resources.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/bee9a512
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/bee9a512
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/bee9a512
Branch: refs/heads/master
Commit: bee9a5126683fe61070ff544e20dd6ee8cfd92f0
Parents: 8fde656
Author: Oliver B. Fischer <pl...@apache.org>
Authored: Mon Feb 9 23:47:11 2015 +0100
Committer: Oliver B. Fischer <pl...@apache.org>
Committed: Mon Feb 9 23:47:11 2015 +0100
----------------------------------------------------------------------
.../src/main/resources/findbugs/findbugs-exclude.xml | 6 +++---
.../tamaya/resolver/internal/ResourceResolver.java | 15 +++++++++------
2 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/bee9a512/buildconfigurations/src/main/resources/findbugs/findbugs-exclude.xml
----------------------------------------------------------------------
diff --git a/buildconfigurations/src/main/resources/findbugs/findbugs-exclude.xml b/buildconfigurations/src/main/resources/findbugs/findbugs-exclude.xml
index 46f3e91..7098b8e 100644
--- a/buildconfigurations/src/main/resources/findbugs/findbugs-exclude.xml
+++ b/buildconfigurations/src/main/resources/findbugs/findbugs-exclude.xml
@@ -78,9 +78,9 @@ under the License.
<Match>
<Class name="org.apache.tamaya.core.internal.PropertiesFileLoader"/>
</Match>
- <Match>
- <Class name="org.apache.tamaya.resolver.internal.ResourceResolver" />
- </Match>
+ <!--<Match>-->
+ <!--<Class name="org.apache.tamaya.resolver.internal.ResourceResolver" />-->
+ <!--</Match>-->
<!--<Match>-->
<!--<Class name="org.apache.tamaya.resolver.internal.FileResolver" />-->
<!--</Match>-->
http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/bee9a512/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ResourceResolver.java
----------------------------------------------------------------------
diff --git a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ResourceResolver.java b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ResourceResolver.java
index f792554..cbd083c 100644
--- a/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ResourceResolver.java
+++ b/modules/resolver/src/main/java/org/apache/tamaya/resolver/internal/ResourceResolver.java
@@ -32,6 +32,8 @@ import java.util.List;
import java.util.logging.Level;
import java.util.logging.Logger;
+import static java.nio.charset.StandardCharsets.UTF_8;
+
/**
* Property resolver implementation that tries to load the given resource from the current classpath using the
* Thread Context classloader, and as fallback from the classloader that loaded this module and system classloader.
@@ -83,16 +85,17 @@ public final class ResourceResolver implements ExpressionResolver {
private String readURL(String expression, List<ClassLoader> classLoaders) {
URL url = getUrl(expression, classLoaders);
- BufferedReader in;
- try {
- in = new BufferedReader(
- new InputStreamReader(url.openStream()));
+
+ try (InputStreamReader streamReader = new InputStreamReader(url.openStream(), UTF_8);
+ BufferedReader bufferedReader = new BufferedReader(streamReader)){
+
StringBuilder builder = new StringBuilder();
String inputLine;
- while ((inputLine = in.readLine()) != null) {
+
+ while ((inputLine = bufferedReader.readLine()) != null) {
builder.append(inputLine).append("\n");
}
- in.close();
+
return builder.toString();
} catch (Exception e) {
LOG.log(Level.FINEST, "Could not resolve URL: " + expression, e);