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/10/09 22:00:30 UTC
svn commit: r1396261 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Author: rmannibucau
Date: Tue Oct 9 20:00:30 2012
New Revision: 1396261
URL: http://svn.apache.org/viewvc?rev=1396261&view=rev
Log:
managing empty appId (standalone)
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1396261&r1=1396260&r2=1396261&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Tue Oct 9 20:00:30 2012
@@ -1230,9 +1230,11 @@ public class Assembler extends Assembler
}
}
- unbind(globalContext, "global/" + appInfo.appId);
- unbind(globalContext, appInfo.appId);
- unbind(globalContext, "openejb/global/global/" + appInfo.appId);
+ if (appInfo.appId != null && !appInfo.appId.isEmpty()) {
+ unbind(globalContext, "global/" + appInfo.appId);
+ unbind(globalContext, appInfo.appId);
+ unbind(globalContext, "openejb/global/global/" + appInfo.appId);
+ }
// dumpJndiTree(globalContext, "\n\nJndi Tree After unbinds:\n======================\n\n");
}