svn commit: r1750810 - in /turbine/core/trunk/src/java/org/apache/turbine: Turbine.java services/pull/TurbinePullService.java

[gk]

Author: gk
Date: Thu Jun 30 14:50:31 2016
New Revision: 1750810

URL: http://svn.apache.org/viewvc?rev=1750810&view=rev
Log:
- catch Throwable (NoClassDefFoundError) locally (as ClassNotFoundException), 
and as fallback in Turbine.

Modified:
    turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
    
turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java

Modified: turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java?rev=1750810&r1=1750809&r2=1750810&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/Turbine.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/Turbine.java Thu Jun 30 
14:50:31 2016
@@ -214,7 +214,7 @@ public class Turbine
                     throw new TurbineException("No RunData Service 
configured!");
                 }
             }
-            catch (Exception e)
+            catch (Throwable e)
             {
                 // save the exception to complain loudly later :-)
                 initFailure = e;

Modified: 
turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java
URL: 
http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java?rev=1750810&r1=1750809&r2=1750810&view=diff
==============================================================================
--- 
turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java
 (original)
+++ 
turbine/core/trunk/src/java/org/apache/turbine/services/pull/TurbinePullService.java
 Thu Jun 30 14:50:31 2016
@@ -341,7 +341,8 @@ public class TurbinePullService
                 log.info("Tool " + toolClassName
                     + " to add to the context as '$" + toolName + "'");
             }
-            catch (Exception e)
+            // NoClassDefFoundError + ClassNotFoundException
+            catch (Throwable e)
             {
                 log.error("Cannot instantiate tool class "
                     + toolClassName + ": ", e);