author | joehw |
Wed, 04 Oct 2017 10:54:18 -0700 | |
changeset 47312 | d4f959806fe9 |
parent 47216 | 71c04702a3d5 |
child 48412 | d4412e380f6b |
permissions | -rw-r--r-- |
12005 | 1 |
/* |
45853
bfa06be36a17
8181154: Fix lint warnings in JAXP repo: deprecation
joehw
parents:
42806
diff
changeset
|
2 |
* Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved. |
12005 | 3 |
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 |
* |
|
5 |
* This code is free software; you can redistribute it and/or modify it |
|
6 |
* under the terms of the GNU General Public License version 2 only, as |
|
7 |
* published by the Free Software Foundation. Oracle designates this |
|
8 |
* particular file as subject to the "Classpath" exception as provided |
|
9 |
* by Oracle in the LICENSE file that accompanied this code. |
|
10 |
* |
|
11 |
* This code is distributed in the hope that it will be useful, but WITHOUT |
|
12 |
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
13 |
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
14 |
* version 2 for more details (a copy is included in the LICENSE file that |
|
15 |
* accompanied this code). |
|
16 |
* |
|
17 |
* You should have received a copy of the GNU General Public License version |
|
18 |
* 2 along with this work; if not, write to the Free Software Foundation, |
|
19 |
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
|
20 |
* |
|
21 |
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
|
22 |
* or visit www.oracle.com if you need additional information or have any |
|
23 |
* questions. |
|
24 |
*/ |
|
25 |
||
26 |
package javax.xml.parsers; |
|
27 |
||
28 |
import java.io.File; |
|
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
29 |
import java.security.AccessController; |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
30 |
import java.security.PrivilegedAction; |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
31 |
import java.util.Iterator; |
12458 | 32 |
import java.util.Properties; |
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
33 |
import java.util.ServiceConfigurationError; |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
34 |
import java.util.ServiceLoader; |
42806
35843e3d5ef1
8146271: File system contention in debug print via XPathFactory.newInstance
aefimov
parents:
27574
diff
changeset
|
35 |
import java.util.function.Supplier; |
47312 | 36 |
import jdk.xml.internal.SecuritySupport; |
12005 | 37 |
|
38 |
/** |
|
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
39 |
* <p>Implements pluggable Parsers.</p> |
12005 | 40 |
* |
41 |
* <p>This class is duplicated for each JAXP subpackage so keep it in |
|
42 |
* sync. It is package private for secure class loading.</p> |
|
43 |
* |
|
44 |
* @author Santiago.PericasGeertsen@sun.com |
|
12458 | 45 |
* @author Huizhe.Wang@oracle.com |
12005 | 46 |
*/ |
47 |
class FactoryFinder { |
|
16953 | 48 |
private static final String DEFAULT_PACKAGE = "com.sun.org.apache.xerces.internal"; |
12005 | 49 |
/** |
50 |
* Internal debug flag. |
|
51 |
*/ |
|
52 |
private static boolean debug = false; |
|
53 |
||
54 |
/** |
|
27574 | 55 |
* Cache for properties in java.home/conf/jaxp.properties |
12005 | 56 |
*/ |
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
57 |
private static final Properties cacheProps = new Properties(); |
12005 | 58 |
|
59 |
/** |
|
27574 | 60 |
* Flag indicating if properties from java.home/conf/jaxp.properties |
12005 | 61 |
* have been cached. |
62 |
*/ |
|
12458 | 63 |
static volatile boolean firstTime = true; |
12005 | 64 |
|
65 |
// Define system property "jaxp.debug" to get output |
|
66 |
static { |
|
67 |
// Use try/catch block to support applets, which throws |
|
68 |
// SecurityException out of this code. |
|
69 |
try { |
|
47312 | 70 |
String val = SecuritySupport.getSystemProperty("jaxp.debug"); |
12005 | 71 |
// Allow simply setting the prop to turn on debug |
72 |
debug = val != null && !"false".equals(val); |
|
73 |
} |
|
74 |
catch (SecurityException se) { |
|
75 |
debug = false; |
|
76 |
} |
|
77 |
} |
|
78 |
||
42806
35843e3d5ef1
8146271: File system contention in debug print via XPathFactory.newInstance
aefimov
parents:
27574
diff
changeset
|
79 |
private static void dPrint(Supplier<String> msgGen) { |
12005 | 80 |
if (debug) { |
42806
35843e3d5ef1
8146271: File system contention in debug print via XPathFactory.newInstance
aefimov
parents:
27574
diff
changeset
|
81 |
System.err.println("JAXP: " + msgGen.get()); |
12005 | 82 |
} |
83 |
} |
|
84 |
||
85 |
/** |
|
86 |
* Attempt to load a class using the class loader supplied. If that fails |
|
87 |
* and fall back is enabled, the current (i.e. bootstrap) class loader is |
|
88 |
* tried. |
|
89 |
* |
|
90 |
* If the class loader supplied is <code>null</code>, first try using the |
|
91 |
* context class loader followed by the current (i.e. bootstrap) class |
|
92 |
* loader. |
|
12458 | 93 |
* |
94 |
* Use bootstrap classLoader if cl = null and useBSClsLoader is true |
|
12005 | 95 |
*/ |
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
96 |
static private Class<?> getProviderClass(String className, ClassLoader cl, |
12458 | 97 |
boolean doFallback, boolean useBSClsLoader) throws ClassNotFoundException |
12005 | 98 |
{ |
99 |
try { |
|
100 |
if (cl == null) { |
|
12458 | 101 |
if (useBSClsLoader) { |
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
102 |
return Class.forName(className, false, FactoryFinder.class.getClassLoader()); |
12458 | 103 |
} else { |
47312 | 104 |
cl = SecuritySupport.getContextClassLoader(); |
12458 | 105 |
if (cl == null) { |
106 |
throw new ClassNotFoundException(); |
|
107 |
} |
|
108 |
else { |
|
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
109 |
return Class.forName(className, false, cl); |
12458 | 110 |
} |
12005 | 111 |
} |
112 |
} |
|
113 |
else { |
|
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
114 |
return Class.forName(className, false, cl); |
12005 | 115 |
} |
116 |
} |
|
117 |
catch (ClassNotFoundException e1) { |
|
118 |
if (doFallback) { |
|
119 |
// Use current class loader - should always be bootstrap CL |
|
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
120 |
return Class.forName(className, false, FactoryFinder.class.getClassLoader()); |
12005 | 121 |
} |
122 |
else { |
|
123 |
throw e1; |
|
124 |
} |
|
125 |
} |
|
126 |
} |
|
127 |
||
128 |
/** |
|
129 |
* Create an instance of a class. Delegates to method |
|
130 |
* <code>getProviderClass()</code> in order to load the class. |
|
131 |
* |
|
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
132 |
* @param type Base class / Service interface of the factory to |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
133 |
* instantiate. |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
134 |
* |
12005 | 135 |
* @param className Name of the concrete class corresponding to the |
136 |
* service provider |
|
137 |
* |
|
12458 | 138 |
* @param cl <code>ClassLoader</code> used to load the factory class. If <code>null</code> |
139 |
* current <code>Thread</code>'s context classLoader is used to load the factory class. |
|
12005 | 140 |
* |
141 |
* @param doFallback True if the current ClassLoader should be tried as |
|
142 |
* a fallback if the class is not found using cl |
|
143 |
*/ |
|
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
144 |
static <T> T newInstance(Class<T> type, String className, ClassLoader cl, |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
145 |
boolean doFallback) |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
146 |
throws FactoryConfigurationError |
12005 | 147 |
{ |
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
148 |
return newInstance(type, className, cl, doFallback, false); |
12458 | 149 |
} |
150 |
||
151 |
/** |
|
152 |
* Create an instance of a class. Delegates to method |
|
153 |
* <code>getProviderClass()</code> in order to load the class. |
|
154 |
* |
|
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
155 |
* @param type Base class / Service interface of the factory to |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
156 |
* instantiate. |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
157 |
* |
12458 | 158 |
* @param className Name of the concrete class corresponding to the |
159 |
* service provider |
|
160 |
* |
|
161 |
* @param cl <code>ClassLoader</code> used to load the factory class. If <code>null</code> |
|
162 |
* current <code>Thread</code>'s context classLoader is used to load the factory class. |
|
163 |
* |
|
164 |
* @param doFallback True if the current ClassLoader should be tried as |
|
165 |
* a fallback if the class is not found using cl |
|
166 |
* |
|
167 |
* @param useBSClsLoader True if cl=null actually meant bootstrap classLoader. This parameter |
|
168 |
* is needed since DocumentBuilderFactory/SAXParserFactory defined null as context classLoader. |
|
169 |
*/ |
|
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
170 |
static <T> T newInstance(Class<T> type, String className, ClassLoader cl, |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
171 |
boolean doFallback, boolean useBSClsLoader) |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
172 |
throws FactoryConfigurationError |
12458 | 173 |
{ |
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
174 |
assert type != null; |
16953 | 175 |
// make sure we have access to restricted packages |
176 |
if (System.getSecurityManager() != null) { |
|
177 |
if (className != null && className.startsWith(DEFAULT_PACKAGE)) { |
|
178 |
cl = null; |
|
179 |
useBSClsLoader = true; |
|
180 |
} |
|
181 |
} |
|
182 |
||
12005 | 183 |
try { |
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
184 |
Class<?> providerClass = getProviderClass(className, cl, doFallback, useBSClsLoader); |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
185 |
if (!type.isAssignableFrom(providerClass)) { |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
186 |
throw new ClassCastException(className + " cannot be cast to " + type.getName()); |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
187 |
} |
45853
bfa06be36a17
8181154: Fix lint warnings in JAXP repo: deprecation
joehw
parents:
42806
diff
changeset
|
188 |
Object instance = providerClass.getConstructor().newInstance(); |
42806
35843e3d5ef1
8146271: File system contention in debug print via XPathFactory.newInstance
aefimov
parents:
27574
diff
changeset
|
189 |
final ClassLoader clD = cl; |
35843e3d5ef1
8146271: File system contention in debug print via XPathFactory.newInstance
aefimov
parents:
27574
diff
changeset
|
190 |
dPrint(()->"created new instance of " + providerClass + |
35843e3d5ef1
8146271: File system contention in debug print via XPathFactory.newInstance
aefimov
parents:
27574
diff
changeset
|
191 |
" using ClassLoader: " + clD); |
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
192 |
return type.cast(instance); |
12005 | 193 |
} |
194 |
catch (ClassNotFoundException x) { |
|
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
195 |
throw new FactoryConfigurationError(x, |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
196 |
"Provider " + className + " not found"); |
12005 | 197 |
} |
198 |
catch (Exception x) { |
|
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
199 |
throw new FactoryConfigurationError(x, |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
200 |
"Provider " + className + " could not be instantiated: " + x); |
12005 | 201 |
} |
202 |
} |
|
203 |
||
204 |
/** |
|
205 |
* Finds the implementation Class object in the specified order. Main |
|
206 |
* entry point. |
|
207 |
* @return Class object of factory, never null |
|
208 |
* |
|
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
209 |
* @param type Base class / Service interface of the |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
210 |
* factory to find. |
12005 | 211 |
* @param fallbackClassName Implementation class name, if nothing else |
212 |
* is found. Use null to mean no fallback. |
|
213 |
* |
|
214 |
* Package private so this code can be shared. |
|
215 |
*/ |
|
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
216 |
static <T> T find(Class<T> type, String fallbackClassName) |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
217 |
throws FactoryConfigurationError |
12005 | 218 |
{ |
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
219 |
final String factoryId = type.getName(); |
42806
35843e3d5ef1
8146271: File system contention in debug print via XPathFactory.newInstance
aefimov
parents:
27574
diff
changeset
|
220 |
dPrint(()->"find factoryId =" + factoryId); |
12005 | 221 |
|
222 |
// Use the system property first |
|
223 |
try { |
|
47312 | 224 |
String systemProp = SecuritySupport.getSystemProperty(factoryId); |
12005 | 225 |
if (systemProp != null) { |
42806
35843e3d5ef1
8146271: File system contention in debug print via XPathFactory.newInstance
aefimov
parents:
27574
diff
changeset
|
226 |
dPrint(()->"found system property, value=" + systemProp); |
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
227 |
return newInstance(type, systemProp, null, true); |
12005 | 228 |
} |
229 |
} |
|
230 |
catch (SecurityException se) { |
|
231 |
if (debug) se.printStackTrace(); |
|
232 |
} |
|
233 |
||
27574 | 234 |
// try to read from $java.home/conf/jaxp.properties |
12005 | 235 |
try { |
236 |
if (firstTime) { |
|
237 |
synchronized (cacheProps) { |
|
238 |
if (firstTime) { |
|
47312 | 239 |
String configFile = SecuritySupport.getSystemProperty("java.home") + File.separator + |
27574 | 240 |
"conf" + File.separator + "jaxp.properties"; |
12005 | 241 |
File f = new File(configFile); |
242 |
firstTime = false; |
|
47312 | 243 |
if (SecuritySupport.doesFileExist(f)) { |
42806
35843e3d5ef1
8146271: File system contention in debug print via XPathFactory.newInstance
aefimov
parents:
27574
diff
changeset
|
244 |
dPrint(()->"Read properties file "+f); |
47312 | 245 |
cacheProps.load(SecuritySupport.getFileInputStream(f)); |
12005 | 246 |
} |
247 |
} |
|
248 |
} |
|
249 |
} |
|
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
250 |
final String factoryClassName = cacheProps.getProperty(factoryId); |
12005 | 251 |
|
252 |
if (factoryClassName != null) { |
|
42806
35843e3d5ef1
8146271: File system contention in debug print via XPathFactory.newInstance
aefimov
parents:
27574
diff
changeset
|
253 |
dPrint(()->"found in ${java.home}/conf/jaxp.properties, value=" + factoryClassName); |
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
254 |
return newInstance(type, factoryClassName, null, true); |
12005 | 255 |
} |
256 |
} |
|
257 |
catch (Exception ex) { |
|
258 |
if (debug) ex.printStackTrace(); |
|
259 |
} |
|
260 |
||
261 |
// Try Jar Service Provider Mechanism |
|
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
262 |
T provider = findServiceProvider(type); |
12005 | 263 |
if (provider != null) { |
264 |
return provider; |
|
265 |
} |
|
266 |
if (fallbackClassName == null) { |
|
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
267 |
throw new FactoryConfigurationError( |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
268 |
"Provider for " + factoryId + " cannot be found"); |
12005 | 269 |
} |
270 |
||
42806
35843e3d5ef1
8146271: File system contention in debug print via XPathFactory.newInstance
aefimov
parents:
27574
diff
changeset
|
271 |
dPrint(()->"loaded from fallback value: " + fallbackClassName); |
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
272 |
return newInstance(type, fallbackClassName, null, true); |
12005 | 273 |
} |
274 |
||
275 |
/* |
|
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
276 |
* Try to find provider using the ServiceLoader API |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
277 |
* |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
278 |
* @param type Base class / Service interface of the factory to find. |
12005 | 279 |
* |
280 |
* @return instance of provider class if found or null |
|
281 |
*/ |
|
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
282 |
private static <T> T findServiceProvider(final Class<T> type) { |
12005 | 283 |
try { |
17264
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
284 |
return AccessController.doPrivileged(new PrivilegedAction<T>() { |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
285 |
public T run() { |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
286 |
final ServiceLoader<T> serviceLoader = ServiceLoader.load(type); |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
287 |
final Iterator<T> iterator = serviceLoader.iterator(); |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
288 |
if (iterator.hasNext()) { |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
289 |
return iterator.next(); |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
290 |
} else { |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
291 |
return null; |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
292 |
} |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
293 |
} |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
294 |
}); |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
295 |
} catch(ServiceConfigurationError e) { |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
296 |
// It is not possible to wrap an error directly in |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
297 |
// FactoryConfigurationError - so we need to wrap the |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
298 |
// ServiceConfigurationError in a RuntimeException. |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
299 |
// The alternative would be to modify the logic in |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
300 |
// FactoryConfigurationError to allow setting a |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
301 |
// Throwable as the cause, but that could cause |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
302 |
// compatibility issues down the road. |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
303 |
final RuntimeException x = new RuntimeException( |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
304 |
"Provider for " + type + " cannot be created", e); |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
305 |
final FactoryConfigurationError error = |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
306 |
new FactoryConfigurationError(x, x.getMessage()); |
3aff554ad461
8005954: JAXP Plugability Layer should use java.util.ServiceLoader
dfuchs
parents:
16953
diff
changeset
|
307 |
throw error; |
12005 | 308 |
} |
309 |
} |
|
310 |
||
311 |
} |