diff --git a/core/src/main/java/hudson/util/CopyOnWriteList.java b/core/src/main/java/hudson/util/CopyOnWriteList.java index 745c86669c..c209ce8f88 100644 --- a/core/src/main/java/hudson/util/CopyOnWriteList.java +++ b/core/src/main/java/hudson/util/CopyOnWriteList.java @@ -41,6 +41,8 @@ import java.util.Arrays; import java.util.logging.Level; import java.util.logging.Logger; +import static java.util.logging.Level.WARNING; + /** * {@link List}-like implementation that has copy-on-write semantics. * @@ -184,7 +186,9 @@ public class CopyOnWriteList implements Iterable { Object item = readItem(reader, context, items); items.add(item); } catch (CannotResolveClassException e) { - LOGGER.log(Level.WARNING,"Failed to resolve class",e); + LOGGER.log(WARNING,"Failed to resolve class",e); + } catch (LinkageError e) { + LOGGER.log(WARNING,"Failed to resolve class",e); } reader.moveUp(); } diff --git a/core/src/main/java/hudson/util/RobustCollectionConverter.java b/core/src/main/java/hudson/util/RobustCollectionConverter.java index e0efb7e100..693bc69d99 100644 --- a/core/src/main/java/hudson/util/RobustCollectionConverter.java +++ b/core/src/main/java/hudson/util/RobustCollectionConverter.java @@ -35,6 +35,10 @@ import com.thoughtworks.xstream.XStream; import java.util.Collection; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CopyOnWriteArraySet; +import java.util.logging.Level; +import java.util.logging.Logger; + +import static java.util.logging.Level.WARNING; /** * {@link CollectionConverter} that ignores {@link CannotResolveClassException}. @@ -82,10 +86,13 @@ public class RobustCollectionConverter extends CollectionConverter { Object item = readItem(reader, context, collection); collection.add(item); } catch (CannotResolveClassException e) { - System.err.println("failed to locate class: "+e); + LOGGER.log(WARNING,"Failed to resolve class",e); + } catch (LinkageError e) { + LOGGER.log(WARNING,"Failed to resolve class",e); } reader.moveUp(); } } + private static final Logger LOGGER = Logger.getLogger(RobustCollectionConverter.class.getName()); } diff --git a/core/src/main/java/hudson/util/RobustReflectionConverter.java b/core/src/main/java/hudson/util/RobustReflectionConverter.java index f4829c0a17..91b45e37b9 100644 --- a/core/src/main/java/hudson/util/RobustReflectionConverter.java +++ b/core/src/main/java/hudson/util/RobustReflectionConverter.java @@ -51,6 +51,8 @@ import java.util.HashMap; import java.util.logging.Logger; import java.util.logging.Level; +import static java.util.logging.Level.WARNING; + /** * Custom {@link ReflectionConverter} that handle errors more gracefully. * @@ -240,9 +242,11 @@ public class RobustReflectionConverter implements Converter { } } } catch (NonExistentFieldException e) { - LOGGER.log(Level.WARNING,"Skipping a non-existent field "+e.getFieldName(),e); + LOGGER.log(WARNING,"Skipping a non-existent field "+e.getFieldName(),e); } catch (CannotResolveClassException e) { - LOGGER.log(Level.WARNING,"Skipping a non-existend type",e); + LOGGER.log(WARNING,"Skipping a non-existend type",e); + } catch (LinkageError e) { + LOGGER.log(WARNING,"Failed to resolve a type",e); } reader.moveUp();