You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2013/12/18 07:22:19 UTC
[1/2] git commit: CAMEL-7072 Fixed the Veracode compliance with
thanks to Leonid
Updated Branches:
refs/heads/master 191768f01 -> ec54b6818
CAMEL-7072 Fixed the Veracode compliance with thanks to Leonid
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e01faced
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e01faced
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e01faced
Branch: refs/heads/master
Commit: e01faced430c1b097957598a4c96359141d8c720
Parents: 191768f
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Dec 18 14:09:20 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Dec 18 14:09:20 2013 +0800
----------------------------------------------------------------------
.../apache/camel/impl/converter/AnnotationTypeConverterLoader.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e01faced/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java b/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
index 5fe4642..74e3f0e 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/converter/AnnotationTypeConverterLoader.java
@@ -165,7 +165,7 @@ public class AnnotationTypeConverterLoader implements TypeConverterLoader {
Class<?> clazz = null;
for (ClassLoader loader : resolver.getClassLoaders()) {
try {
- clazz = loader.loadClass(name);
+ clazz = ObjectHelper.loadClass(name, loader);
LOG.trace("Loaded {} as class {}", name, clazz);
classes.add(clazz);
// class founder, so no need to load it with another class loader
[2/2] git commit: CAMEL-7075 Fixed the Improper Resource Shutdown or
Release issue of FileInputStreamCache with thanks to Leonid
Posted by ni...@apache.org.
CAMEL-7075 Fixed the Improper Resource Shutdown or Release issue of FileInputStreamCache with thanks to Leonid
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ec54b681
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ec54b681
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ec54b681
Branch: refs/heads/master
Commit: ec54b68188abe6d899979f16d06acbb063e775f8
Parents: e01face
Author: Willem Jiang <wi...@gmail.com>
Authored: Wed Dec 18 14:19:44 2013 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Wed Dec 18 14:19:44 2013 +0800
----------------------------------------------------------------------
.../org/apache/camel/converter/stream/FileInputStreamCache.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ec54b681/camel-core/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java b/camel-core/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
index c794431..a298f40 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/stream/FileInputStreamCache.java
@@ -88,6 +88,7 @@ public final class FileInputStreamCache extends InputStream implements StreamCac
pos += i;
}
s.close();
+ fc.close();
} else {
IOHelper.copy(getInputStream(), os);
}