infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-16 05:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

7092764: java.awt.font.TransformAttribute.equals(null) throws NPE

Browse Source 
Reviewed-by: jgodinez, jchen
This commit is contained in:
Phil Race 2013-09-26 15:06:39 -07:00
parent f0b751a854
commit d0ef16f2c3
2 changed files with 69 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jdk/src/share/classes/java/awt/font/TransformAttribute.java
View File

@ -141,14 +141,16 @@ public final class TransformAttribute implements Serializable {
* @since 1.6
*/
public boolean equals(Object rhs) {
try {
TransformAttribute that = (TransformAttribute)rhs;
if (transform == null) {
return that.transform == null;
if (rhs != null) {
try {
TransformAttribute that = (TransformAttribute)rhs;
if (transform == null) {
return that.transform == null;
}
return transform.equals(that.transform);
}
catch (ClassCastException e) {
}
return transform.equals(that.transform);
}
catch (ClassCastException e) {
}
return false;
}

60
jdk/test/java/awt/font/TransformAttribute/TransformEqualityTest.java Normal file
View File

@ -0,0 +1,60 @@
/*
* 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
* @summary test equals method
* @bug 7092764
*/
import java.awt.font.TransformAttribute;
import java.awt.geom.AffineTransform;
public class TransformEqualityTest {
public static void main(String[] args) {
AffineTransform tx1 = new AffineTransform(1, 0, 1, 1, 0, 0);
AffineTransform tx2 = new AffineTransform(1, 0, 1, 1, 0, 0);
AffineTransform tx3 = new AffineTransform(2, 0, 1, 1, 0, 0);
TransformAttribute ta1a = new TransformAttribute(tx1);
TransformAttribute ta1b = new TransformAttribute(tx1);
TransformAttribute ta2 = new TransformAttribute(tx2);
TransformAttribute ta3 = new TransformAttribute(tx3);
if (ta1a.equals(null)) {
throw new RuntimeException("should not be equal to null.");
}
if (!ta1a.equals(ta1a)) {
throw new RuntimeException("(1) should be equal.");
}
if (!ta1a.equals(ta1b)) {
throw new RuntimeException("(2) should be equal.");
}
if (!ta1a.equals(ta2)) {
throw new RuntimeException("(3) should be equal.");
}
if (ta2.equals(ta3)) {
throw new RuntimeException("should be different.");
}
}
}