Skip to content

Commit 32c32ed

Browse files
hansonrhansonr
hansonr
authored and
hansonr
committed
removing Logger calls in javax.xml
1 parent 71b7839 commit 32c32ed

File tree

2 files changed

+30
-30
lines changed

2 files changed

+30
-30
lines changed

‎sources/net.sf.j2s.java.core/src/javax/xml/bind/ContextFinder.java‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,19 @@ class ContextFinder {
8787
// previous value of JAXBContext.JAXB_CONTEXT_FACTORY, using also this to ensure backwards compatibility
8888
private static final String JAXB_CONTEXT_FACTORY_DEPRECATED = "javax.xml.bind.context.factory";
8989

90-
private static final Logger logger;
90+
private static Logger logger;
9191

9292
static {
93-
logger = Logger.getLogger("javax.xml.bind");
93+
//logger = Logger.getLogger("javax.xml.bind");
9494
try {
9595
if (AccessController.doPrivileged(new GetPropertyAction("jaxb.debug")) != null) {
9696
// disconnect the logger from a bigger framework (if any)
9797
// and take the matters into our own hands
98-
logger.setUseParentHandlers(false);
99-
logger.setLevel(Level.ALL);
98+
//Logger.setUseParentHandlers(false);
99+
//Logger.setLevel(Level.ALL);
100100
ConsoleHandler handler = new ConsoleHandler();
101101
handler.setLevel(Level.ALL);
102-
logger.addHandler(handler);
102+
//Logger.addHandler(handler);
103103
} else {
104104
// don't change the setting of this logger
105105
// to honor what other frameworks
@@ -278,10 +278,10 @@ static JAXBContext newInstance(Class[] classes, Map properties, String className
278278
throw new JAXBException(Messages.format(Messages.DEFAULT_PROVIDER_NOT_FOUND), e);
279279
}
280280

281-
if (logger.isLoggable(Level.FINE)) {
281+
//if (Logger.isLoggable(Level.FINE)) {
282282
// extra check to avoid costly which operation if not logged
283-
logger.log(Level.FINE, "loaded {0} from {1}", new Object[]{className, which(spi)});
284-
}
283+
//Logger.log(Level.FINE, "loaded {0} from {1}", new Object[]{className, which(spi)});
284+
//}
285285

286286
return newInstance(classes, properties, spi);
287287
}
@@ -360,14 +360,14 @@ static JAXBContext find(String factoryId,
360360
}
361361

362362
// else no provider found
363-
logger.fine("Trying to create the platform default provider");
363+
//Logger.fine("Trying to create the platform default provider");
364364
return newInstance(contextPath, contextPathClasses, PLATFORM_DEFAULT_FACTORY_CLASS, classLoader, properties);
365365
}
366366

367367
static JAXBContext find(Class<?>[] classes, Map<String, ?> properties) throws JAXBException {
368368

369369
// search for jaxb.properties in the class loader of each class first
370-
logger.fine("Searching jaxb.properties");
370+
//Logger.fine("Searching jaxb.properties");
371371
for (final Class c : classes) {
372372
// this classloader is used only to load jaxb.properties, so doing this should be safe.
373373
// this is possible for primitives, arrays, and classes that are
@@ -408,7 +408,7 @@ static JAXBContext find(Class<?>[] classes, Map<String, ?> properties) throws JA
408408
String className = firstByServiceLoaderDeprecated(JAXBContext.class, getContextClassLoader());
409409
if (className != null) return newInstance(classes, properties, className);
410410

411-
logger.fine("Trying to create the platform default provider");
411+
//Logger.fine("Trying to create the platform default provider");
412412
Class ctxFactoryClass =
413413
(Class) ServiceLoaderUtil.lookupUsingOSGiServiceLoader("javax.xml.bind.JAXBContext", logger);
414414

@@ -417,7 +417,7 @@ static JAXBContext find(Class<?>[] classes, Map<String, ?> properties) throws JA
417417
}
418418

419419
// else no provider found
420-
logger.fine("Trying to create the platform default provider");
420+
//Logger.fine("Trying to create the platform default provider");
421421
return newInstance(classes, properties, PLATFORM_DEFAULT_FACTORY_CLASS);
422422
}
423423

@@ -429,7 +429,7 @@ static JAXBContext find(Class<?>[] classes, Map<String, ?> properties) throws JA
429429
private static String classNameFromPackageProperties(URL packagePropertiesUrl,
430430
String ... factoryIds) throws JAXBException {
431431

432-
logger.log(Level.FINE, "Trying to locate {0}", packagePropertiesUrl.toString());
432+
//Logger.log(Level.FINE, "Trying to locate {0}", packagePropertiesUrl.toString());
433433
Properties props = loadJAXBProperties(packagePropertiesUrl);
434434
for(String factoryId : factoryIds) {
435435
if (props.containsKey(factoryId)) {
@@ -464,19 +464,19 @@ private static String classNameFromSystemProperties() throws JAXBException {
464464
private static String getDeprecatedSystemProperty(String property) {
465465
String value = getSystemProperty(property);
466466
if (value != null) {
467-
logger.log(Level.WARNING, "Using non-standard property: {0}. Property {1} should be used instead.",
468-
new Object[] {property, JAXBContext.JAXB_CONTEXT_FACTORY});
467+
//Logger.log(Level.WARNING, "Using non-standard property: {0}. Property {1} should be used instead.",
468+
// new Object[] {property, JAXBContext.JAXB_CONTEXT_FACTORY});
469469
}
470470
return value;
471471
}
472472

473473
private static String getSystemProperty(String property) {
474-
logger.log(Level.FINE, "Checking system property {0}", property);
474+
//Logger.log(Level.FINE, "Checking system property {0}", property);
475475
String value = AccessController.doPrivileged(new GetPropertyAction(property));
476476
if (value != null) {
477-
logger.log(Level.FINE, " found {0}", value);
477+
//Logger.log(Level.FINE, " found {0}", value);
478478
} else {
479-
logger.log(Level.FINE, " not found");
479+
//Logger.log(Level.FINE, " not found");
480480
}
481481
return value;
482482
}
@@ -485,14 +485,14 @@ private static Properties loadJAXBProperties(URL url) throws JAXBException {
485485

486486
try {
487487
Properties props;
488-
logger.log(Level.FINE, "loading props from {0}", url);
488+
//Logger.log(Level.FINE, "loading props from {0}", url);
489489
props = new Properties();
490490
InputStream is = url.openStream();
491491
props.load(is);
492492
is.close();
493493
return props;
494494
} catch (IOException ioe) {
495-
logger.log(Level.FINE, "Unable to load " + url.toString(), ioe);
495+
//Logger.log(Level.FINE, "Unable to load " + url.toString(), ioe);
496496
throw new JAXBException(ioe.toString(), ioe);
497497
}
498498
}
@@ -608,7 +608,7 @@ static String firstByServiceLoaderDeprecated(Class spiClass,
608608

609609
final String jaxbContextFQCN = spiClass.getName();
610610

611-
logger.fine("Searching META-INF/services");
611+
//Logger.fine("Searching META-INF/services");
612612

613613
// search META-INF services next
614614
BufferedReader r = null;
@@ -626,10 +626,10 @@ static String firstByServiceLoaderDeprecated(Class spiClass,
626626
factoryClassName = factoryClassName.trim();
627627
}
628628
r.close();
629-
logger.log(Level.FINE, "Configured factorty class:{0}", factoryClassName);
629+
//Logger.log(Level.FINE, "Configured factorty class:{0}", factoryClassName);
630630
return factoryClassName;
631631
} else {
632-
logger.log(Level.FINE, "Unable to load:{0}", resource);
632+
//Logger.log(Level.FINE, "Unable to load:{0}", resource);
633633
return null;
634634
}
635635
} catch (IOException e) {
@@ -640,7 +640,7 @@ static String firstByServiceLoaderDeprecated(Class spiClass,
640640
r.close();
641641
}
642642
} catch (IOException ex) {
643-
logger.log(Level.SEVERE, "Unable to close resource: " + resource, ex);
643+
//Logger.log(Level.SEVERE, "Unable to close resource: " + resource, ex);
644644
}
645645
}
646646
}

‎sources/net.sf.j2s.java.core/src/javax/xml/bind/ServiceLoaderUtil.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ static <P, T extends Exception> P firstByServiceLoader(Class<P> spiClass,
6767
ServiceLoader<P> serviceLoader = ServiceLoader.load(spiClass);
6868

6969
for (P impl : serviceLoader) {
70-
logger.fine("ServiceProvider loading Facility used; returning object [" +
71-
impl.getClass().getName() + "]");
72-
70+
// logger.fine("ServiceProvider loading Facility used; returning object [" +
71+
// impl.getClass().getName() + "]");
72+
//
7373
return impl;
7474
}
7575
} catch (Throwable t) {
@@ -88,8 +88,8 @@ static Object lookupUsingOSGiServiceLoader(String factoryId, Logger logger) {
8888
Iterator iter = ((Iterable) m.invoke(null, serviceClass)).iterator();
8989
if (iter.hasNext()) {
9090
Object next = iter.next();
91-
logger.fine("Found implementation using OSGi facility; returning object [" +
92-
next.getClass().getName() + "].");
91+
// logger.fine("Found implementation using OSGi facility; returning object [" +
92+
// next.getClass().getName() + "].");
9393
return next;
9494
} else {
9595
return null;
@@ -99,7 +99,7 @@ static Object lookupUsingOSGiServiceLoader(String factoryId, Logger logger) {
9999
ClassNotFoundException |
100100
NoSuchMethodException ignored) {
101101

102-
logger.log(Level.FINE, "Unable to find from OSGi: [" + factoryId + "]", ignored);
102+
// logger.log(Level.FINE, "Unable to find from OSGi: [" + factoryId + "]", ignored);
103103
return null;
104104
}
105105
}

0 commit comments

Comments
 (0)