Repository: commons-lang Updated Branches: refs/heads/master 0223a4d4c -> ed14537b8
LANG-1251: SerializationUtils.ClassLoaderAwareObjectInputStream should use static initializer to initialize primitiveTypes map (closes #180) Modify to use static initializer to initialize primitiveTypes map. Project: http://git-wip-us.apache.org/repos/asf/commons-lang/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-lang/commit/aa31bc6c Tree: http://git-wip-us.apache.org/repos/asf/commons-lang/tree/aa31bc6c Diff: http://git-wip-us.apache.org/repos/asf/commons-lang/diff/aa31bc6c Branch: refs/heads/master Commit: aa31bc6c313789c344d715b7c1aeea0cd8de47e2 Parents: 0223a4d Author: Takuya UESHIN <[email protected]> Authored: Wed Jul 27 14:00:46 2016 +0900 Committer: pascalschumacher <[email protected]> Committed: Sun Jul 31 19:48:53 2016 +0200 ---------------------------------------------------------------------- .../commons/lang3/SerializationUtils.java | 23 +++++++++++--------- 1 file changed, 13 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-lang/blob/aa31bc6c/src/main/java/org/apache/commons/lang3/SerializationUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/lang3/SerializationUtils.java b/src/main/java/org/apache/commons/lang3/SerializationUtils.java index 68ebbd5..4ffc865 100644 --- a/src/main/java/org/apache/commons/lang3/SerializationUtils.java +++ b/src/main/java/org/apache/commons/lang3/SerializationUtils.java @@ -283,6 +283,19 @@ public class SerializationUtils { static class ClassLoaderAwareObjectInputStream extends ObjectInputStream { private static final Map<String, Class<?>> primitiveTypes = new HashMap<String, Class<?>>(); + + static { + primitiveTypes.put("byte", byte.class); + primitiveTypes.put("short", short.class); + primitiveTypes.put("int", int.class); + primitiveTypes.put("long", long.class); + primitiveTypes.put("float", float.class); + primitiveTypes.put("double", double.class); + primitiveTypes.put("boolean", boolean.class); + primitiveTypes.put("char", char.class); + primitiveTypes.put("void", void.class); + } + private final ClassLoader classLoader; /** @@ -295,16 +308,6 @@ public class SerializationUtils { public ClassLoaderAwareObjectInputStream(final InputStream in, final ClassLoader classLoader) throws IOException { super(in); this.classLoader = classLoader; - - primitiveTypes.put("byte", byte.class); - primitiveTypes.put("short", short.class); - primitiveTypes.put("int", int.class); - primitiveTypes.put("long", long.class); - primitiveTypes.put("float", float.class); - primitiveTypes.put("double", double.class); - primitiveTypes.put("boolean", boolean.class); - primitiveTypes.put("char", char.class); - primitiveTypes.put("void", void.class); } /**
