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 2009/03/24 16:52:15 UTC
svn commit: r757861 - in /camel/trunk/components/camel-osgi/src:
main/java/org/apache/camel/osgi/OsgiPackageScanClassResolver.java
test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java
Author: ningjiang
Date: Tue Mar 24 15:52:10 2009
New Revision: 757861
URL: http://svn.apache.org/viewvc?rev=757861&view=rev
Log:
CAMEL-1481 fixed the test error of my last commit
Modified:
camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiPackageScanClassResolver.java
camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java
Modified: camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiPackageScanClassResolver.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiPackageScanClassResolver.java?rev=757861&r1=757860&r2=757861&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiPackageScanClassResolver.java (original)
+++ camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiPackageScanClassResolver.java Tue Mar 24 15:52:10 2009
@@ -47,14 +47,14 @@
packageName = packageName.replace('.', '/');
Set<ClassLoader> set = getClassLoaders();
ClassLoader osgiClassLoader = getOsgiClassLoader(set);
-
+ int classesSize = classes.size();
if (osgiClassLoader != null) {
// if we have an osgi bundle loader use this one first
LOG.debug("Using only osgi bundle classloader");
findInOsgiClassLoader(test, packageName, osgiClassLoader, classes);
}
- if (classes.size() == 0) {
+ if (classes.size() == classesSize) {
// Using the regular classloaders as a fallback
LOG.debug("Using only regular classloaders");
for (ClassLoader classLoader : set.toArray(new ClassLoader[set.size()])) {
Modified: camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java?rev=757861&r1=757860&r2=757861&view=diff
==============================================================================
--- camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java (original)
+++ camel/trunk/components/camel-osgi/src/test/java/org/apache/camel/osgi/OsgiAnnotationTypeConverterLoaderTest.java Tue Mar 24 15:52:10 2009
@@ -20,12 +20,12 @@
public class OsgiAnnotationTypeConverterLoaderTest extends CamelOsgiTestSupport {
- public void testLoad() throws Exception {
+ public void testLoad() throws Exception {
OsgiAnnotationTypeConverterLoader loader = new OsgiAnnotationTypeConverterLoader(getResolver());
MockTypeConverterRegistry registry = new MockTypeConverterRegistry();
loader.load(registry);
- assertEquals("There should have a fallback converter", registry.getFallbackTypeConverters().size(), 1);
- assertEquals("There should have a coverter", registry.getTypeConverters().size(), 1);
+ assertTrue("There should have at lest one fallback converter", registry.getFallbackTypeConverters().size() >= 1);
+ assertTrue("There should have at lest one coverter", registry.getTypeConverters().size() >= 1);
}
}