infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-19 04:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

8370467: BorderFactory.createBevelBorder and createSoftBevelBorder throws NPE for null highlight and shadow

Browse Source 
Reviewed-by: aivanov, tr, honkar
This commit is contained in:
Prasanta Sadhukhan 2025-11-13 01:19:37 +00:00
parent d2571ea76a
commit bc66d3e65d
2 changed files with 68 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java.desktop/share/classes/javax/swing/border/BevelBorder.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2025, 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
@ -95,7 +95,9 @@ public class BevelBorder extends AbstractBorder
* @param shadow the color to use for the bevel shadow
*/
public BevelBorder(int bevelType, Color highlight, Color shadow) {
this(bevelType, highlight.brighter(), highlight, shadow, shadow.brighter());
this(bevelType,
(highlight != null) ? highlight.brighter() : null, highlight,
shadow, (shadow != null) ? shadow.brighter() : null);
}
/**

64
test/jdk/javax/swing/border/TestBevelBorderParam.java Normal file
View File

@ -0,0 +1,64 @@
/*
* Copyright (c) 2025, 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 8370467
* @summary Verifies createBevelBorder and createSoftBevelBorder does not throw NPE
* @run main TestBevelBorderParam
*/
import javax.swing.BorderFactory;
import javax.swing.border.BevelBorder;
public class TestBevelBorderParam {
public static void main(String[] args) throws Exception {
StringBuilder str = new StringBuilder();
try {
BorderFactory.createBevelBorder(BevelBorder.RAISED, null, null);
} catch (NullPointerException ex) {
str.append("\n");
str.append("BorderFactory.createBevelBorder throws NPE for null highlight and shadow");
}
try {
BorderFactory.createSoftBevelBorder(BevelBorder.RAISED, null, null);
} catch (NullPointerException e) {
str.append("\n");
str.append("BorderFactory.createSoftBevelBorder throws NPE for null highlight and shadow");
}
try {
new BevelBorder(BevelBorder.RAISED, null, null);
} catch (NullPointerException ex) {
str.append("\n");
str.append("BevelBorder constructor throws NPE for null highlight and shadow");
}
if (str.length() != 0) {
throw new RuntimeException(str.toString());
}
}
}