Mercurial > hg > openjdk > lambda > jdk
changeset 10482:6fe5443c3dde
8027066: XMLDecoder in java 7 cannot properly deserialize object arrays
Reviewed-by: alexsch, malenkov
Contributed-by: anton.nashatyrev@oracle.com
author | alitvinov |
---|---|
date | Fri, 25 Oct 2013 13:41:19 +0400 |
parents | c561db53a24c |
children | 75ae2a980db5 |
files | src/share/classes/com/sun/beans/decoder/ArrayElementHandler.java test/java/beans/XMLEncoder/Test8027066.java |
diffstat | 2 files changed, 56 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/com/sun/beans/decoder/ArrayElementHandler.java Thu Oct 24 19:50:33 2013 +0400 +++ b/src/share/classes/com/sun/beans/decoder/ArrayElementHandler.java Fri Oct 25 13:41:19 2013 +0400 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2013 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 @@ -110,6 +110,20 @@ } /** + * Tests whether the value of this element can be used + * as an argument of the element that contained in this one. + * + * @return {@code true} if the value of this element can be used + * as an argument of the element that contained in this one, + * {@code false} otherwise + */ + @Override + protected boolean isArgument() { + return true; // hack for compatibility + } + + + /** * Creates an instance of the array. * * @param type the base class
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/beans/XMLEncoder/Test8027066.java Fri Oct 25 13:41:19 2013 +0400 @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2013, 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 8027066 + * @summary Tests that the same array can be encoded twice + * @author Anton Nashatyrev + */ +public class Test8027066 extends AbstractTest<String[][]> { + public static void main(String[] args) { + new Test8027066().test(true); + } + + @Override + protected String[][] getObject() { + String[] strings = {"first", "second"}; + String[][] arrays = {strings, strings}; + return arrays; + } +}