You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/12/04 17:50:46 UTC
svn commit: r1417028 - in
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb:
OpenEjbContainer.java config/AnnotationDeployer.java
Author: rmannibucau
Date: Tue Dec 4 16:50:45 2012
New Revision: 1417028
URL: http://svn.apache.org/viewvc?rev=1417028&view=rev
Log:
member can be null
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java
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/OpenEjbContainer.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java?rev=1417028&r1=1417027&r2=1417028&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/OpenEjbContainer.java Tue Dec 4 16:50:45 2012
@@ -155,7 +155,7 @@ public class OpenEjbContainer extends EJ
}
final Assembler assembler = SystemInstance.get().getComponent(Assembler.class);
- if (assembler != null) { // if startup failed
+ if (assembler != null) {
for (AppInfo info : assembler.getDeployedApplications()) {
try {
assembler.destroyApplication(info);
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=1417028&r1=1417027&r2=1417028&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 Tue Dec 4 16:50:45 2012
@@ -4051,7 +4051,9 @@ public class AnnotationDeployer implemen
consumer.getResourceRef().add(resourceRef);
}
- resourceRef.setOrigin(member.getDeclaringClass() + "#" + member.getName());
+ if (member != null) {
+ resourceRef.setOrigin(member.getDeclaringClass() + "#" + member.getName());
+ } // TODO: else @Resource on a class
if (resourceRef.getResAuth() == null) {
if (resource.authenticationType() == Resource.AuthenticationType.APPLICATION) {