Author: dblevins
Date: Thu Jul 9 07:45:13 2009
New Revision: 792433
URL: http://svn.apache.org/viewvc?rev=792433&view=rev
Log:
Don't assume global context is an instance of IvmContext
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=792433&r1=792432&r2=792433&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
Thu Jul 9 07:45:13 2009
@@ -894,10 +894,12 @@
}
try {
- IvmContext ivmContext = (IvmContext) globalContext;
- ivmContext.prune("openejb/Deployment");
- ivmContext.prune("openejb/local");
- ivmContext.prune("openejb/remote");
+ if (globalContext instanceof IvmContext) {
+ IvmContext ivmContext = (IvmContext) globalContext;
+ ivmContext.prune("openejb/Deployment");
+ ivmContext.prune("openejb/local");
+ ivmContext.prune("openejb/remote");
+ }
} catch (NamingException e) {
undeployException.getCauses().add(new Exception("Unable to prune
openejb/Deployments and openejb/local namespaces, this could cause future
deployments to fail.", e));
}