Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LANG-1251: SerializationUtils.ClassLoaderAwareObjectInputStream should use static initializer to initialize primitiveTypes map (closes #180) 

Modify to use static initializer to initialize primitiveTypes map.
This commit is contained in:
Takuya UESHIN 2016-07-27 14:00:46 +09:00 committed by pascalschumacher
parent 0223a4d4cd
commit aa31bc6c31
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/org/apache/commons/lang3/SerializationUtils.java
View File

@ -283,6 +283,19 @@ public class SerializationUtils {
static class ClassLoaderAwareObjectInputStream extends ObjectInputStream { static class ClassLoaderAwareObjectInputStream extends ObjectInputStream {
private static final Map<String, Class<?>> primitiveTypes = private static final Map<String, Class<?>> primitiveTypes =
new HashMap<String, Class<?>>(); 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; private final ClassLoader classLoader;
/** /**
@ -295,16 +308,6 @@ public class SerializationUtils {
public ClassLoaderAwareObjectInputStream(final InputStream in, final ClassLoader classLoader) throws IOException { public ClassLoaderAwareObjectInputStream(final InputStream in, final ClassLoader classLoader) throws IOException {
super(in); super(in);
this.classLoader = classLoader; 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);
} }
/** /**