archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-26 14:24:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8187556: Backout of a fix reintroduced a dependency that had since been removed

Browse source 
Reviewed-by: duke
This commit is contained in:
Jesper Wilhelmsson 2017-09-14 22:57:36 +02:00
parent 8d9060c1a6
commit 65db4f42d0
13 changed files with 755 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/java.base/share/classes/java/io/ObjectInputStream.java
View file

@ -44,7 +44,6 @@ import java.util.concurrent.ConcurrentMap;
import static java.io.ObjectStreamClass.processQueue;
import jdk.internal.misc.ObjectStreamClassValidator;
import jdk.internal.misc.SharedSecrets;
import jdk.internal.misc.Unsafe;
import sun.reflect.misc.ReflectUtil;
@ -1767,9 +1766,6 @@ public class ObjectInputStream
throw new StreamCorruptedException(
String.format("invalid type code: %02X", tc));
}
if (descriptor != null) {
validateDescriptor(descriptor);
}
return descriptor;
}
@ -4013,20 +4009,4 @@ public class ObjectInputStream
SharedSecrets.setJavaObjectInputStreamAccess(ObjectInputStream::checkArray);
}
private void validateDescriptor(ObjectStreamClass descriptor) {
ObjectStreamClassValidator validating = validator;
if (validating != null) {
validating.validateDescriptor(descriptor);
}
}
// controlled access to ObjectStreamClassValidator
private volatile ObjectStreamClassValidator validator;
private static void setValidator(ObjectInputStream ois, ObjectStreamClassValidator validator) {
ois.validator = validator;
}
static {
SharedSecrets.setJavaObjectInputStreamAccess(ObjectInputStream::setValidator);
}
}