6788484: NPE in DefaultTableCellHeaderRenderer.getColumnSortOrder() with null table
Reviewed-by: rupashka
This commit is contained in:
parent
003df98660
commit
db380d5775
jdk
src/share/classes/sun/swing/table
test/javax/swing/JTable/6788484
@ -127,7 +127,7 @@ public class DefaultTableCellHeaderRenderer extends DefaultTableCellRenderer
|
||||
|
||||
public static SortOrder getColumnSortOrder(JTable table, int column) {
|
||||
SortOrder rv = null;
|
||||
if (table.getRowSorter() == null) {
|
||||
if (table == null || table.getRowSorter() == null) {
|
||||
return rv;
|
||||
}
|
||||
java.util.List<? extends RowSorter.SortKey> sortKeys =
|
||||
|
39
jdk/test/javax/swing/JTable/6788484/bug6788484.java
Normal file
39
jdk/test/javax/swing/JTable/6788484/bug6788484.java
Normal file
@ -0,0 +1,39 @@
|
||||
/*
|
||||
* Copyright 2010 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
|
||||
* CA 95054 USA or visit www.sun.com if you need additional information or
|
||||
* have any questions.
|
||||
*/
|
||||
|
||||
/* @test
|
||||
@bug 6788484
|
||||
@summary NPE in DefaultTableCellHeaderRenderer.getColumnSortOrder() with null table
|
||||
@author Alexander Potochkin
|
||||
@run main bug6788484
|
||||
*/
|
||||
import sun.swing.table.DefaultTableCellHeaderRenderer;
|
||||
|
||||
import javax.swing.*;
|
||||
|
||||
public class bug6788484 {
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
DefaultTableCellHeaderRenderer.getColumnSortOrder(null, 0);
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user