svn commit: r1479944 - /tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java

[rmannibucau]

Author: rmannibucau
Date: Tue May  7 15:32:07 2013
New Revision: 1479944

URL: http://svn.apache.org/r1479944
Log:
handling WebBeansCreationException in WebContext

Modified:
    
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java

Modified: 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java?rev=1479944&r1=1479943&r2=1479944&view=diff
==============================================================================
--- 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
 (original)
+++ 
tomee/tomee/trunk/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/JavaeeInstanceManager.java
 Tue May  7 15:32:07 2013
@@ -28,6 +28,7 @@ import java.lang.reflect.InvocationTarge
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import org.apache.webbeans.exception.WebBeansConfigurationException;
+import org.apache.webbeans.exception.WebBeansCreationException;
 
 /**
  * @version $Rev$ $Date$
@@ -55,9 +56,11 @@ public class JavaeeInstanceManager imple
             final Object object = webContext.newInstance(clazz);
             postConstruct(object, clazz);
             return object;
-        } catch (OpenEJBException e) {
+        } catch (final OpenEJBException e) {
+            throw (InstantiationException) new 
InstantiationException(e.getMessage()).initCause(e);
+        } catch (final WebBeansConfigurationException e) {
             throw (InstantiationException) new 
InstantiationException(e.getMessage()).initCause(e);
-        } catch (WebBeansConfigurationException e) {
+        } catch (final WebBeansCreationException e) {
             throw (InstantiationException) new 
InstantiationException(e.getMessage()).initCause(e);
         }
     }