You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by jo...@apache.org on 2013/12/28 15:59:48 UTC
git commit: DELTASPIKE-399 Make sure the streams are closed in case
we're not returning them back to the user
Updated Branches:
refs/heads/master 7c8039a82 -> 023de9212
DELTASPIKE-399 Make sure the streams are closed in case we're not returning them back to the user
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/023de921
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/023de921
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/023de921
Branch: refs/heads/master
Commit: 023de921238b05a670bff99038a661659c7f23bd
Parents: 7c8039a
Author: John D. Ament <jo...@gmail.com>
Authored: Sat Dec 28 09:59:03 2013 -0500
Committer: John D. Ament <jo...@gmail.com>
Committed: Sat Dec 28 09:59:03 2013 -0500
----------------------------------------------------------------------
.../core/impl/resourceloader/ClasspathResourceProvider.java | 5 +++++
.../core/impl/resourceloader/ResourceLoaderExtension.java | 5 ++++-
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/023de921/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 c2483dc..755534d 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,6 +71,11 @@ public class ClasspathResourceProvider extends BaseResourceProvider
{
if (firstURL != null)
{
+ if (result != null)
+ {
+ result.close();
+ }
+ is.close();
throw new IllegalStateException("multiple files found for '" + name +
"' (" + firstURL.toExternalForm() + ", " + url.toExternalForm() + ")");
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/023de921/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ResourceLoaderExtension.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ResourceLoaderExtension.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ResourceLoaderExtension.java
index 98cdb5d..c526082 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ResourceLoaderExtension.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/resourceloader/ResourceLoaderExtension.java
@@ -18,7 +18,10 @@
*/
package org.apache.deltaspike.core.impl.resourceloader;
-import javax.enterprise.inject.spi.*;
+import javax.enterprise.inject.spi.AnnotatedType;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.BeforeBeanDiscovery;
+import javax.enterprise.inject.spi.Extension;
/**
* This is needed for certain class loading cases (EARs, external modules).