Mercurial > hg > icedtea7-forest > jdk
changeset 8090:829ca47df2ce jdk7u71-b02
Merge
author | asaha |
---|---|
date | Fri, 27 Jun 2014 09:58:04 -0700 |
parents | 986b24217379 (current diff) 5316fe79a90e (diff) |
children | f5b10a0686c5 1723d5159a90 |
files | .hgtags |
diffstat | 3 files changed, 71 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Jun 25 09:24:05 2014 -0700 +++ b/.hgtags Fri Jun 27 09:58:04 2014 -0700 @@ -452,6 +452,7 @@ 190017413768f02addea8b2c5106157e3c4076c7 jdk7u65-b16 23e78e36bc39f4f761ac2b0e055c562c3ff204f5 jdk7u65-b17 96d1fa382dda17ae105f28083bda41f79fc3093f jdk7u65-b30 +7b47a34063e94e1ab5636b11231d33fae92754c9 jdk7u65-b31 9ccfe70cee626ac7831cfa7b7a7eb7a88fe1cd42 jdk7u66-b00 fc87b55d62fc1e81aaf61ff21175129b8ccc302e jdk7u66-b01 c67e394e49429565540f04c5c2a5544f750658bb jdk7u66-b09
--- a/src/share/classes/java/io/ObjectOutputStream.java Wed Jun 25 09:24:05 2014 -0700 +++ b/src/share/classes/java/io/ObjectOutputStream.java Fri Jun 27 09:58:04 2014 -0700 @@ -1254,7 +1254,7 @@ } bout.setBlockDataMode(true); - if (isCustomSubclass()) { + if (cl != null && isCustomSubclass()) { ReflectUtil.checkPackageAccess(cl); } annotateProxyClass(cl); @@ -1283,7 +1283,7 @@ Class cl = desc.forClass(); bout.setBlockDataMode(true); - if (isCustomSubclass()) { + if (cl != null && isCustomSubclass()) { ReflectUtil.checkPackageAccess(cl); } annotateClass(cl);
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/io/Serializable/unresolvableObjectStreamClass/UnresolvableObjectStreamClass.java Fri Jun 27 09:58:04 2014 -0700 @@ -0,0 +1,68 @@ +/* + * Copyright (c) 2014, 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 8039396 + * @run main UnresolvableObjectStreamClass serialize + * @clean MySerializable + * @run main UnresolvableObjectStreamClass deserialize + * + * @summary NPE when writing a class descriptor object to a custom + * ObjectOutputStream + */ + +import java.io.*; + +public class UnresolvableObjectStreamClass { + public static void main(String[] args) throws Throwable { + if (args.length > 0 && args[0].equals("serialize")) { + try (FileOutputStream fos = new FileOutputStream("temp1.ser"); + ObjectOutputStream oos = new ObjectOutputStream(fos)) { + ObjectStreamClass osc = + ObjectStreamClass.lookup(MySerializable.class); + oos.writeObject(osc); + } + } else if (args.length > 0 && args[0].equals("deserialize")) { + try (FileInputStream fis = new FileInputStream("temp1.ser"); + ObjectInputStream ois = new ObjectInputStream(fis); + FileOutputStream fos = new FileOutputStream("temp2.ser"); + ObjectOutputStream oos = new ObjectOutputStream(fos) { + /*must be subclassed*/}) { + ObjectStreamClass osc = (ObjectStreamClass)ois.readObject(); + // serialize it again + try { + oos.writeObject(osc); + } catch (NullPointerException e) { + throw new RuntimeException("Failed to write" + + " unresolvable ObjectStreamClass", e); + } + } + } else { + throw new RuntimeException("The command line option must be" + + " one of: serialize or deserialize"); + } + } +} + +class MySerializable implements Serializable { +}