Author: ningjiang Date: Mon Jan 5 20:30:23 2009 New Revision: 731824 URL: http://svn.apache.org/viewvc?rev=731824&view=rev Log: CAMEL-1221 Fixed the osgi plateform test error
Modified: activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java Modified: activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java?rev=731824&r1=731823&r2=731824&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java (original) +++ activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/Activator.java Mon Jan 5 20:30:23 2009 @@ -84,7 +84,8 @@ } - protected void addComponentEntry(Enumeration e, Map<String, ComponentEntry> entries) { + protected synchronized void addComponentEntry(String entryPath, Bundle bundle, Map<String, ComponentEntry> entries) { + Enumeration e = bundle.getEntryPaths(entryPath); if (e != null) { while (e.hasMoreElements()) { String path = (String)e.nextElement(); @@ -101,9 +102,9 @@ } - protected synchronized void mayBeAddComponentAndLanguageFor(Bundle bundle) { - addComponentEntry(bundle.getEntryPaths(META_INF_COMPONENT), COMPONENTS); - addComponentEntry(bundle.getEntryPaths(META_INF_LANGUAGE), LANGUAGES); + protected void mayBeAddComponentAndLanguageFor(Bundle bundle) { + addComponentEntry(META_INF_COMPONENT, bundle, COMPONENTS); + addComponentEntry(META_INF_LANGUAGE, bundle, LANGUAGES); } protected synchronized void mayBeAddTypeConverterFor(Bundle bundle) { @@ -127,7 +128,7 @@ } } - protected synchronized void mayBeRemoveComponentAndLanguageFor(Bundle bundle) { + protected void mayBeRemoveComponentAndLanguageFor(Bundle bundle) { removeComponentEntry(bundle, COMPONENTS); removeComponentEntry(bundle, LANGUAGES); } @@ -251,13 +252,16 @@ return getClassFromEntries(name, LANGUAGES); } - protected static Class getClassFromEntries(String name, Map<String, ComponentEntry> entries) throws Exception { + protected static synchronized Class getClassFromEntries(String name, Map<String, ComponentEntry> entries) throws Exception { ComponentEntry entry = entries.get(name); if (entry == null) { return null; } if (entry.type == null) { URL url = entry.bundle.getEntry(entry.path); + if (LOG.isDebugEnabled()) { + LOG.debug("The entry " + name + "'s url is" + url); + } // lets load the file Properties properties = new Properties(); BufferedInputStream reader = null; Modified: activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java?rev=731824&r1=731823&r2=731824&view=diff ============================================================================== --- activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java (original) +++ activemq/camel/trunk/components/camel-osgi/src/main/java/org/apache/camel/osgi/OsgiComponentResolver.java Mon Jan 5 20:30:23 2009 @@ -38,7 +38,7 @@ private static final transient Log LOG = LogFactory.getLog(OsgiComponentResolver.class); - protected synchronized Class getComponent(String name) throws Exception { + protected Class getComponent(String name) throws Exception { return Activator.getComponent(name); }