[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
This commit is contained in:
kohsuke committed 2010-01-26 16:54:15 +00:00
1 parent 1aaf1be3e2
commit 196276f204
3 files changed
+19 -4

No files matched your search

@@ -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<E> implements Iterable<E> {
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();
}
@@ -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());
}
@@ -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();