svn commit: r1370290 - in /openejb/trunk/openejb/arquillian: arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/ arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/

[rmannibucau]

Author: rmannibucau
Date: Tue Aug  7 14:53:49 2012
New Revision: 1370290

URL: http://svn.apache.org/viewvc?rev=1370290&view=rev
Log:
small cleanup + the cleanup observer of DeploymentExceptionObserver was badly 
done

Modified:
    
openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java
    
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
    
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java

Modified: 
openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java?rev=1370290&r1=1370289&r2=1370290&view=diff
==============================================================================
--- 
openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java
 (original)
+++ 
openejb/trunk/openejb/arquillian/arquillian-common/src/main/java/org/apache/openejb/arquillian/common/deployment/DeploymentExceptionObserver.java
 Tue Aug  7 14:53:49 2012
@@ -18,20 +18,18 @@ public class DeploymentExceptionObserver
         try {
             dd.proceed();
         } catch (Exception t) {
-            if (t == null) {
-                EXCEPTIONS.put(NullPointerException.class, new 
NullPointerException());
-            } else {
-                EXCEPTIONS.put(t.getClass(), t);
-                Throwable current = t.getCause();
-                while (current != null) {
-                    if (current instanceof Exception) {
-                        PARENT_EXCEPTIONS.put(current.getClass(), (Exception) 
current);
-                    }
-                    if (current.getCause() != current) {
-                        current = current.getCause();
-                    }
+            EXCEPTIONS.put(t.getClass(), t);
+
+            Throwable current = t.getCause();
+            while (current != null) {
+                if (current instanceof Exception) {
+                    PARENT_EXCEPTIONS.put(current.getClass(), (Exception) 
current);
+                }
+                if (current.getCause() != current) {
+                    current = current.getCause();
                 }
             }
+
             throw t;
         }
     }
@@ -50,7 +48,7 @@ public class DeploymentExceptionObserver
         return set;
     }
 
-    public void cleanUp(@Observes final EventContext<AfterClass> event) throws 
Exception {
+    public void cleanUp(@Observes final AfterClass event) throws Exception {
         EXCEPTIONS.clear();
         PARENT_EXCEPTIONS.clear();
     }

Modified: 
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java?rev=1370290&r1=1370289&r2=1370290&view=diff
==============================================================================
--- 
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
 (original)
+++ 
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBDeployableContainer.java
 Tue Aug  7 14:53:49 2012
@@ -187,12 +187,15 @@ public class OpenEJBDeployableContainer 
             throw new DeploymentException("can't deploy " + archive.getName(), 
e);
         }
 
-
         return new ProtocolMetaData();
     }
 
     @Override
     public void undeploy(final Archive<?> archive) throws DeploymentException {
+        if (appContext.get() == null) {
+            return;
+        }
+
         try {
             assembler.destroyApplication(info.get().path);
             
stopContexts(appContext.get().getWebBeansContext().getContextsService(), 
servletContext.get(), session.get());

Modified: 
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java?rev=1370290&r1=1370289&r2=1370290&view=diff
==============================================================================
--- 
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java
 (original)
+++ 
openejb/trunk/openejb/arquillian/arquillian-openejb-embedded-4/src/main/java/org/apache/openejb/arquillian/openejb/OpenEJBExtension.java
 Tue Aug  7 14:53:49 2012
@@ -63,9 +63,9 @@ public class OpenEJBExtension implements
         if (ArquillianUtil.isCurrentAdapter(OPENEJB_ADAPTER_NAME)) {
             extensionBuilder.service(DeployableContainer.class, 
OpenEJBDeployableContainer.class)
                 .service(TestEnricher.class, OpenEJBInjectionEnricher.class)
+                .service(ResourceProvider.class, 
DeploymentExceptionProvider.class)
                 .observer(TestObserver.class)
-                .observer(DeploymentExceptionObserver.class)
-                .service(ResourceProvider.class, 
DeploymentExceptionProvider.class);
+                .observer(DeploymentExceptionObserver.class);
         }
     }
 }