openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1072765 - /openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
Date Sun, 20 Feb 2011 22:10:10 GMT
Author: struberg
Date: Sun Feb 20 22:10:10 2011
New Revision: 1072765

URL: http://svn.apache.org/viewvc?rev=1072765&view=rev
Log:
OWB-461 don't catch Throwables because java.lang.Errors must not get catched!

Modified:
    openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java

Modified: openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java?rev=1072765&r1=1072764&r2=1072765&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
(original)
+++ openwebbeans/trunk/webbeans-porting/src/main/java/org/apache/webbeans/test/tck/StandaloneContainersImpl.java
Sun Feb 20 22:10:10 2011
@@ -48,12 +48,16 @@ import org.apache.openejb.jee.StatelessB
 import org.apache.webbeans.config.WebBeansContext;
 import org.apache.webbeans.ejb.EjbPlugin;
 import org.apache.webbeans.lifecycle.StandaloneLifeCycle;
+import org.apache.webbeans.logger.WebBeansLogger;
 import org.apache.webbeans.test.tck.mock.TCKMetaDataDiscoveryImpl;
 import org.jboss.testharness.api.DeploymentException;
 import org.jboss.testharness.spi.StandaloneContainers;
 
 public class StandaloneContainersImpl implements StandaloneContainers
 {
+    /**Logger instance*/
+    private  final WebBeansLogger logger = WebBeansLogger.getLogger(StandaloneContainersImpl.class);
+
     private StandaloneLifeCycle lifeCycle = null;
 
     private DeploymentException excpetion;
@@ -85,7 +89,7 @@ public class StandaloneContainersImpl im
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            logger.error(e);
             this.excpetion = new DeploymentException("Standalone Container Impl.", e);
             throw this.excpetion;
         }
@@ -140,7 +144,7 @@ public class StandaloneContainersImpl im
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            logger.error(e);
             this.excpetion = new DeploymentException("Standalone Container Impl.", e);
 
             return false;
@@ -171,7 +175,7 @@ public class StandaloneContainersImpl im
                 EjbPlugin plugin = (EjbPlugin) WebBeansContext.getInstance().getPluginLoader().getEjbPlugin();
                 plugin.setUseInTest(false);
             }
-            catch (Throwable e)
+            catch (Exception e)
             {
                 // Not worry
             }
@@ -202,11 +206,19 @@ public class StandaloneContainersImpl im
     @Override
     public boolean deploy(Collection<Class<?>> classes, Collection<URL>
xmls)
     {
-        setUp(classes);
+        if (!setUp(classes))
+        {
+            return false;
+        }
+
         return deployInternal(classes, xmls);
     }
 
-    private void setUp(Collection<Class<?>> classes)
+    /**
+     * @param classes
+     * @return <code>true</code> if the setup succeed, <code>false</code>
otherwise.
+     */
+    private boolean setUp(Collection<Class<?>> classes)
     {
 
         try
@@ -231,21 +243,20 @@ public class StandaloneContainersImpl im
             properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, InitContextFactory.class.getName());
             new InitialContext(properties);
 
-            try
+            EjbPlugin plugin = (EjbPlugin) WebBeansContext.getInstance().getPluginLoader().getEjbPlugin();
+            if (plugin != null)
             {
-                EjbPlugin plugin = (EjbPlugin) WebBeansContext.getInstance().getPluginLoader().getEjbPlugin();
                 plugin.setUseInTest(true);
             }
-            catch (Throwable e)
-            {
-                // Not worry
-            }
 
         }
         catch (Exception e)
         {
-            e.printStackTrace();
+            logger.error(e);
+            return false;
         }
+
+        return true;
     }
 
     private EjbModule buildTestApp(Collection<Class<?>> classes)



Mime
View raw message