felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject svn commit: r1408793 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlers.java
Date Tue, 13 Nov 2012 15:48:51 GMT
Author: pauls
Date: Tue Nov 13 15:48:51 2012
New Revision: 1408793

URL: http://svn.apache.org/viewvc?rev=1408793&view=rev
Log:
We need to catch Throwable not Exception as URL.setStreamHandlerFactory throws an Error and
not an Exception (FELIX-3753).

Modified:
    felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlers.java

Modified: felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlers.java
URL: http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlers.java?rev=1408793&r1=1408792&r2=1408793&view=diff
==============================================================================
--- felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlers.java (original)
+++ felix/trunk/framework/src/main/java/org/apache/felix/framework/URLHandlers.java Tue Nov
13 15:48:51 2012
@@ -153,7 +153,7 @@ class URLHandlers implements URLStreamHa
                 currentFactory = (URLStreamHandlerFactory) m_secureAction.swapStaticFieldIfNotClass(URL.class,
                     URLStreamHandlerFactory.class, URLHANDLERS_CLASS, "streamHandlerLock");
             }
-            catch (Exception ex)
+            catch (Throwable ex)
             {
                 // Ignore, this is a best effort (maybe log it or something)
             }
@@ -177,7 +177,7 @@ class URLHandlers implements URLStreamHa
                 {
                     URL.setURLStreamHandlerFactory(currentFactory);
                 }
-                catch (Exception ex)
+                catch (Throwable ex)
                 {
                     // Ignore, this is a best effort (maybe log it or something)
                 }



Mime
View raw message