Attachment 709395 Details for Bug 920971 – Proposed patch

[patch] Proposed patch

CAMEL-6158.proposed.patch (text/plain), 1.67 KB, created by Adam Kovari on 2013-03-13 08:31:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Kovari

Created: 2013-03-13 08:31:57 UTC

Size: 1.67 KB

patch

obsolete

>diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java b/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
>index 485ea17..8d0e9db 100644
>--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
>+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
>@@ -293,7 +293,7 @@ public class DefaultPackageScanClassResolver extends ServiceSupport implements P
>                         stream = con.getInputStream();
>                     } else {
>                         log.trace("Loading from jar using file: {}", file);
>-                        stream = new FileInputStream(file);
>+                        stream = url.openStream();
>                     }
> 
>                     loadImplementationsInJar(test, packageName, stream, urlPath, classes, jarCache);
>@@ -418,6 +418,8 @@ public class DefaultPackageScanClassResolver extends ServiceSupport implements P
>      */
>     private List<String> doLoadJarClassEntries(InputStream stream, String urlPath) {
>         List<String> entries = new ArrayList<String>();
>+        
>+        String packageName = urlPath.substring(urlPath.indexOf(".jar/") + 5);
> 
>         JarInputStream jarStream = null;
>         try {
>@@ -429,7 +431,7 @@ public class DefaultPackageScanClassResolver extends ServiceSupport implements P
>                 if (name != null) {
>                     name = name.trim();
>                     if (!entry.isDirectory() && name.endsWith(".class")) {
>-                        entries.add(name);
>+                        entries.add(packageName + name);
>                     }
>                 }
>             }
>

Actions: View | Diff

Attachments on bug 920971: 709394 | 709395