svn commit: r1220901 - in /openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb: config/DeploymentLoader.java util/AnnotationFinder.java

[rmannibucau]

Author: rmannibucau
Date: Mon Dec 19 19:07:53 2011
New Revision: 1220901

URL: http://svn.apache.org/viewvc?rev=1220901&view=rev
Log:
skipping null location which can happen when running in OSGi (temporary hack, 
the discussion should be do we use xbean for scanning instead of our 
AnnotationFinder?)

Modified:
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
    
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1220901&r1=1220900&r2=1220901&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
 Mon Dec 19 19:07:53 2011
@@ -104,7 +104,6 @@ public class DeploymentLoader implements
 
             if (EjbModule.class.equals(moduleClass)) {
                 tempClassLoader = 
ClassLoaderUtil.createTempClassLoader(classLoader);
-                Class<? extends DeploymentModule> o = EjbModule.class;
                 EjbModule ejbModule = createEjbModule(null, null, 
tempClassLoader, null);
                 AppModule appModule = new AppModule(ejbModule);
                 addPersistenceUnits(appModule);

Modified: 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java?rev=1220901&r1=1220900&r2=1220901&view=diff
==============================================================================
--- 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
 (original)
+++ 
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/AnnotationFinder.java
 Mon Dec 19 19:07:53 2011
@@ -113,6 +113,10 @@ public class AnnotationFinder {
         this.urls = urls;
         classNames = new ArrayList<String>();
         for (URL location : urls) {
+            if (location == null) {
+                continue;
+            }
+
             try {
                 if (location.getProtocol().equals("jar")) {
                     classNames.addAll(jar(location));