[HUDSON-5383] improving the XStream converters so that a linkage error in a plugin doesn't cause catastrophic start up failure.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@26445 71c3de6d-444a-0410-be80-ed276b4c234a

Author: kohsuke

Diff for: core/src/main/java/hudson/util/CopyOnWriteList.java

@@ -41,6 +41,8 @@
 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 CopyOnWriteList unmarshal(HierarchicalStreamReader reader, UnmarshallingC
                     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 for: core/src/main/java/hudson/util/RobustCollectionConverter.java

@@ -35,6 +35,10 @@
 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 @@ protected void populateCollection(HierarchicalStreamReader reader, Unmarshalling
                 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 for: core/src/main/java/hudson/util/RobustReflectionConverter.java

@@ -51,6 +51,8 @@
 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 Object doUnmarshal(final Object result, final HierarchicalStreamReader re
                     }
                 }
             } 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();