From 8e35ff71d5455ec13e5d29b911d21f0093dfffe9 Mon Sep 17 00:00:00 2001 From: "leonid.marushevskiy" Date: Mon, 16 Dec 2013 17:19:51 +0200 Subject: [PATCH 1/2] VERACODE-648: fix of CWE ID470 in AnnotationTypeConverterLoader using ObjectHelper.loadClass for class loading --- .../camel/impl/converter/AnnotationTypeConverterLoader.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 52b679679c768..5bdfbb0c5e011 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,10 @@ protected String[] filterPackageNamesOnly(PackageScanClassResolver resolver, Str Class clazz = null; for (ClassLoader loader : resolver.getClassLoaders()) { try { - clazz = loader.loadClass(name); + if(name == null || name.isEmpty()){ + throw new ClassNotFoundException("Invalid class name [" + 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 From fbbd658573891a9132984bed5c618e797bfd0f92 Mon Sep 17 00:00:00 2001 From: "leonid.marushevskiy" Date: Tue, 17 Dec 2013 15:16:16 +0200 Subject: [PATCH 2/2] VERACODE-648: fix of remark about throws a ClassNotFoundException --- .../camel/impl/converter/AnnotationTypeConverterLoader.java | 3 --- 1 file changed, 3 deletions(-) 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 5bdfbb0c5e011..69e3a5b8d96f2 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,9 +165,6 @@ protected String[] filterPackageNamesOnly(PackageScanClassResolver resolver, Str Class clazz = null; for (ClassLoader loader : resolver.getClassLoaders()) { try { - if(name == null || name.isEmpty()){ - throw new ClassNotFoundException("Invalid class name [" + name + "]"); - } clazz = ObjectHelper.loadClass(name, loader); LOG.trace("Loaded {} as class {}", name, clazz); classes.add(clazz);