camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1171084 - in /camel/branches/camel-2.8.x: ./ camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
Date Thu, 15 Sep 2011 12:55:44 GMT
Author: ningjiang
Date: Thu Sep 15 12:55:43 2011
New Revision: 1171084

URL: http://svn.apache.org/viewvc?rev=1171084&view=rev
Log:
Merged revisions 1164972 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1164972 | ningjiang | 2011-09-04 16:48:21 +0800 (Sun, 04 Sep 2011) | 1 line
  
  CAMEL-4411 DefaultPackageScanClassResolver should skip the bundleresource url when it try
to find the classes with package name
........

Modified:
    camel/branches/camel-2.8.x/   (props changed)
    camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 15 12:55:43 2011
@@ -1 +1 @@
-/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163231,1163420,1164544,1164557,1164633,1164973-1165000,1165152,1165157,1165658,1165971,1165987,1167098,1167131,1167448,1167487,1167555,1169610,1169620,1170122,1170226,1170397,1170956
+/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163231,1163420,1164544,1164557,1164633,1164972-1165000,1165152,1165157,1165658,1165971,1165987,1167098,1167131,1167448,1167487,1167555,1169610,1169620,1170122,1170226,1170397,1170956

Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java?rev=1171084&r1=1171083&r2=1171084&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
(original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/impl/DefaultPackageScanClassResolver.java
Thu Sep 15 12:55:43 2011
@@ -264,6 +264,12 @@ public class DefaultPackageScanClassReso
                     continue;
                 }
 
+                // bundle resource should be skipped
+                if (url.toString().startsWith("bundleresource:") || urlPath.startsWith("bundleresource:"))
{
+                    log.trace("Skipping bundleresource: {}", url);
+                    continue;
+                }
+
                 // Else it's in a JAR, grab the path to the jar
                 if (urlPath.indexOf('!') > 0) {
                     urlPath = urlPath.substring(0, urlPath.indexOf('!'));



Mime
View raw message