Author: rmannibucau
Date: Sun Oct 30 22:43:33 2011
New Revision: 1195265
URL: http://svn.apache.org/viewvc?rev=1195265&view=rev
Log:
jar location can be null
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java?rev=1195265&r1=1195264&r2=1195265&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AnnotationDeployer.java
Sun Oct 30 22:43:33 2011
@@ -1077,7 +1077,7 @@ public class AnnotationDeployer implemen
// passing jar location to be able to manage maven
classes/test-classes which have the same moduleId
String id = ejbModule.getModuleId();
- if
(ejbModule.getJarLocation().contains(ejbModule.getModuleId() +
"/target/test-classes")) {
+ if (ejbModule.getJarLocation() != null &&
ejbModule.getJarLocation().contains(ejbModule.getModuleId() +
"/target/test-classes")) {
// with maven if both src/main/java and src/test/java
are deployed
// moduleId.Comp exists twice so it fails
// here we simply modify the test comp bean name to
avoid it
