svn commit: r1184923 - /openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

[jgallimore]

Author: jgallimore
Date: Sun Oct 16 20:32:26 2011
New Revision: 1184923

URL: http://svn.apache.org/viewvc?rev=1184923&view=rev
Log:
Reverting previous commit

Modified:
    
openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java

Modified: 
openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java?rev=1184923&r1=1184922&r2=1184923&view=diff
==============================================================================
--- 
openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 (original)
+++ 
openejb/trunk/openejb/assembly/tomee/tomee-catalina/src/main/java/org/apache/tomee/catalina/TomcatWebAppBuilder.java
 Sun Oct 16 20:32:26 2011
@@ -510,16 +510,12 @@ public class TomcatWebAppBuilder impleme
             JspFactory factory = JspFactory.getDefaultFactory();
             if (factory != null) {
                 JspApplicationContext applicationCtx = 
factory.getJspApplicationContext(standardContext.getServletContext());
-                try {
-                       WebBeansContext context = 
appContext.getWebBeansContext();
-                       if (context != null && 
context.getBeanManagerImpl().isInUse()) {
-                           // Registering ELResolver with JSP container
-                           ELAdaptor elAdaptor = 
context.getService(ELAdaptor.class);
-                           ELResolver resolver = elAdaptor.getOwbELResolver();
-                           applicationCtx.addELResolver(resolver);
-                       }
-                } catch (Exception e) {
-                       logger.error("Error registering EL resolver for " + 
standardContext.getPath() + ": Exception: " + e.getMessage(), e);
+                WebBeansContext context = appContext.getWebBeansContext();
+                if (context != null && context.getBeanManagerImpl().isInUse()) 
{
+                    // Registering ELResolver with JSP container
+                    ELAdaptor elAdaptor = context.getService(ELAdaptor.class);
+                    ELResolver resolver = elAdaptor.getOwbELResolver();
+                    applicationCtx.addELResolver(resolver);
                 }
             }
         }