changeset 9370:55e6175fb690 jdk8u5-b04

8031394: (sl) Fix exception handling in ServiceLoader Reviewed-by: ahgross, mchung, weijun
author alanb
date Tue, 14 Jan 2014 11:48:57 +0000
parents 14016885ec81
children efa010634571
files src/share/classes/java/util/ServiceLoader.java src/share/classes/sun/misc/Service.java
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/java/util/ServiceLoader.java	Mon Jan 13 15:41:45 2014 -0800
+++ b/src/share/classes/java/util/ServiceLoader.java	Tue Jan 14 11:48:57 2014 +0000
@@ -382,7 +382,7 @@
                 return p;
             } catch (Throwable x) {
                 fail(service,
-                     "Provider " + cn + " could not be instantiated: " + x,
+                     "Provider " + cn + " could not be instantiated",
                      x);
             }
             throw new Error();          // This cannot happen
--- a/src/share/classes/sun/misc/Service.java	Mon Jan 13 15:41:45 2014 -0800
+++ b/src/share/classes/sun/misc/Service.java	Tue Jan 14 11:48:57 2014 +0000
@@ -299,7 +299,7 @@
                 return service.cast(c.newInstance());
             } catch (Throwable x) {
                 fail(service,
-                     "Provider " + cn + " could not be instantiated: " + x,
+                     "Provider " + cn + " could not be instantiated",
                      x);
             }
             return null;        /* This cannot happen */