提交 0484b21d 编写于 作者: M malenkov

7092744: XMLEncoder fails to encode and breaks backward compatibility

Reviewed-by: rupashka
上级 33cc058e
/* /*
* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -54,7 +54,7 @@ abstract class AbstractFinder<T> { ...@@ -54,7 +54,7 @@ abstract class AbstractFinder<T> {
/** /**
* Returns an array of {@code Class} objects * Returns an array of {@code Class} objects
* that represent the formal parameter types of the method * that represent the formal parameter types of the method.
* Returns an empty array if the method takes no parameters. * Returns an empty array if the method takes no parameters.
* *
* @param method the object that represents method * @param method the object that represents method
......
/* /*
* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -87,7 +87,7 @@ public final class ConstructorFinder extends AbstractFinder<Constructor<?>> { ...@@ -87,7 +87,7 @@ public final class ConstructorFinder extends AbstractFinder<Constructor<?>> {
/** /**
* Returns an array of {@code Class} objects * Returns an array of {@code Class} objects
* that represent the formal parameter types of the constructor * that represent the formal parameter types of the constructor.
* Returns an empty array if the constructor takes no parameters. * Returns an empty array if the constructor takes no parameters.
* *
* @param constructor the object that represents constructor * @param constructor the object that represents constructor
......
/* /*
* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -190,7 +190,7 @@ public final class MethodFinder extends AbstractFinder<Method> { ...@@ -190,7 +190,7 @@ public final class MethodFinder extends AbstractFinder<Method> {
/** /**
* Returns an array of {@code Class} objects * Returns an array of {@code Class} objects
* that represent the formal parameter types of the method * that represent the formal parameter types of the method.
* Returns an empty array if the method takes no parameters. * Returns an empty array if the method takes no parameters.
* *
* @param method the object that represents method * @param method the object that represents method
...@@ -226,6 +226,6 @@ public final class MethodFinder extends AbstractFinder<Method> { ...@@ -226,6 +226,6 @@ public final class MethodFinder extends AbstractFinder<Method> {
*/ */
@Override @Override
protected boolean isValid(Method method) { protected boolean isValid(Method method) {
return Modifier.isPublic(method.getModifiers()) && method.getName().equals(this.name); return !method.isBridge() && Modifier.isPublic(method.getModifiers()) && method.getName().equals(this.name);
} }
} }
/*
* Copyright (c) 2011, 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 7092744
* @summary Tests for ambiguous methods
* @author Sergey Malenkov
*/
public class Test7092744 extends AbstractTest {
public static void main(String[] args) {
new Test7092744().test(true);
}
protected Object getObject() {
return new Bean();
}
protected Object getAnotherObject() {
Bean bean = new Bean();
bean.setValue(99);
return bean;
}
public static interface I<T extends Number> {
T getValue();
void setValue(T value);
}
public static class Bean implements I<Integer> {
private Integer value;
public Integer getValue() {
return this.value;
}
public void setValue(Integer value) {
this.value = value;
}
}
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册