Mercurial > hg > icedtea8-forest > jdk
changeset 11510:d26fd80f684d jdk8u65-b14
8135043: ObjectStreamClass.getField(String) too restrictive
Reviewed-by: igerasim, chegar
author | igerasim |
---|---|
date | Tue, 08 Sep 2015 22:31:26 +0300 |
parents | e870cf08fd0b |
children | 64c3b5808a70 |
files | src/share/classes/java/io/ObjectStreamClass.java test/java/io/ObjectInputStream/TestObjectStreamClass.java |
diffstat | 2 files changed, 84 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/java/io/ObjectStreamClass.java Tue Sep 08 13:51:42 2015 -0700 +++ b/src/share/classes/java/io/ObjectStreamClass.java Tue Sep 08 22:31:26 2015 +0300 @@ -855,7 +855,6 @@ * types only. Returns matching field, or null if no match found. */ ObjectStreamField getField(String name, Class<?> type) { - requireInitialized(); for (int i = 0; i < fields.length; i++) { ObjectStreamField f = fields[i]; if (f.getName().equals(name)) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/io/ObjectInputStream/TestObjectStreamClass.java Tue Sep 08 22:31:26 2015 +0300 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/* @test + * @bug 8135043 + * @summary ObjectStreamClass.getField(String) too restrictive + */ + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.ObjectStreamClass; +import java.io.Serializable; + +public class TestObjectStreamClass { + + public static void main(String[] args) throws Exception { + ByteArrayOutputStream byteOutput = new ByteArrayOutputStream(); + ObjectOutputStream output = new ObjectOutputStream(byteOutput); + output.writeObject(new TestClass()); + + ByteArrayInputStream bais = new ByteArrayInputStream(byteOutput.toByteArray()); + TestObjectInputStream input = new TestObjectInputStream(bais); + input.readObject(); + + ObjectStreamClass osc = input.getDescriptor(); + + // All OSC public API methods should complete without throwing. + osc.getName(); + osc.forClass(); + osc.getField("str"); + osc.getFields(); + osc.getSerialVersionUID(); + osc.toString(); + } + + static class TestClass implements Serializable { + String str = "hello world"; + } + + static class TestObjectInputStream extends ObjectInputStream { + private ObjectStreamClass objectStreamClass; + + public TestObjectInputStream(InputStream in) throws IOException { + super(in); + } + + public ObjectStreamClass getDescriptor() + throws IOException, ClassNotFoundException + { + return objectStreamClass; + } + + public ObjectStreamClass readClassDescriptor() + throws IOException, ClassNotFoundException + { + objectStreamClass = super.readClassDescriptor(); + return objectStreamClass; + } + } +}