From db380d57754b38902933faf78da71d47cb5cd549 Mon Sep 17 00:00:00 2001
From: Alexander Potochkin <alexp@openjdk.org>
Date: Tue, 15 Jun 2010 19:05:44 +0400
Subject: [PATCH] 6788484: NPE in
DefaultTableCellHeaderRenderer.getColumnSortOrder() with null table
Reviewed-by: rupashka
---
.../table/DefaultTableCellHeaderRenderer.java | 2 +-
.../swing/JTable/6788484/bug6788484.java | 39 +++++++++++++++++++
2 files changed, 40 insertions(+), 1 deletion(-)
create mode 100644 jdk/test/javax/swing/JTable/6788484/bug6788484.java
diff --git a/jdk/src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java b/jdk/src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java
index 8187fea6fb7..78207ce1c0c 100644
--- a/jdk/src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java
+++ b/jdk/src/share/classes/sun/swing/table/DefaultTableCellHeaderRenderer.java
@@ -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 =
diff --git a/jdk/test/javax/swing/JTable/6788484/bug6788484.java b/jdk/test/javax/swing/JTable/6788484/bug6788484.java
new file mode 100644
index 00000000000..cbc23310e87
--- /dev/null
+++ b/jdk/test/javax/swing/JTable/6788484/bug6788484.java
@@ -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);
+ }
+}