Fixes #1622

Atmosphere · Jun 5, 2014 · b159290 · b159290
1 parent 78e62ed
commit b159290
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereServlet.java b/modules/cpr/src/main/java/org/atmosphere/cpr/AtmosphereServlet.java
@@ -87,7 +87,8 @@ protected AtmosphereServlet configureFramework(ServletConfig sc) throws ServletE
                 try {
                     framework = (AtmosphereFramework) sc.getServletContext()
                             .getAttribute(sc.getServletContext().getServletRegistration(sc.getServletName()).getName());
-                } catch (UnsupportedOperationException ex) {
+                } catch (Exception ex) {
+                    // Equinox throw an exception (NPE)
                     // WebLogic Crap => https://github.com/Atmosphere/atmosphere/issues/1569
                     logger.trace("", ex);
                 }