From 5edeb71e3b148d52962c46180c92ebfeda018f67 Mon Sep 17 00:00:00 2001
From: Prasanta Sadhukhan <psadhukhan@openjdk.org>
Date: Mon, 15 Dec 2025 04:45:25 +0000
Subject: [PATCH] 6292135: DefaultTableModel.setColumnIdentifiers() Clears
 JTable Row Heights

Reviewed-by: tr, kizune
---
 .../share/classes/javax/swing/JTable.java     |  2 -
 .../TestRowHeightWithColIdentifier.java       | 64 +++++++++++++++++++
 2 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 test/jdk/javax/swing/JTable/TestRowHeightWithColIdentifier.java

diff --git a/src/java.desktop/share/classes/javax/swing/JTable.java b/src/java.desktop/share/classes/javax/swing/JTable.java
index e9ae9d82166..6e64b216d58 100644
--- a/src/java.desktop/share/classes/javax/swing/JTable.java
+++ b/src/java.desktop/share/classes/javax/swing/JTable.java
@@ -4454,8 +4454,6 @@ public class JTable extends JComponent implements TableModelListener, Scrollable
             // The whole thing changed
             clearSelectionAndLeadAnchor();
 
-            rowModel = null;
-
             if (sortManager != null) {
                 try {
                     ignoreSortChange = true;
diff --git a/test/jdk/javax/swing/JTable/TestRowHeightWithColIdentifier.java b/test/jdk/javax/swing/JTable/TestRowHeightWithColIdentifier.java
new file mode 100644
index 00000000000..ad2015e3b45
--- /dev/null
+++ b/test/jdk/javax/swing/JTable/TestRowHeightWithColIdentifier.java
@@ -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 6292135
+ * @summary Verifies DefaultTableModel.setColumnIdentifiers() doesn't
+ *          clear JTable Row Heights
+ * @run main TestRowHeightWithColIdentifier
+ */
+
+import javax.swing.JTable;
+import javax.swing.SwingUtilities;
+import javax.swing.table.DefaultTableModel;
+
+public class TestRowHeightWithColIdentifier{
+
+
+    public static void main(String[] args) throws Exception {
+        SwingUtilities.invokeAndWait(() -> {
+            DefaultTableModel model = new DefaultTableModel(null, new Object[] {"FOO", "BAR"});
+            JTable table = new JTable(model);
+
+            model.addRow(new Object[] {"00", "01"});
+            model.addRow(new Object[] {"10", "11"});
+            model.addRow(new Object[] {"20", "21"});
+            for (int row = 0; row < table.getRowCount(); row++) {
+                table.setRowHeight(row, 100);
+            }
+            for (int row = 0; row < table.getRowCount(); row++) {
+                System.out.println("Before table rowHeight " + table.getRowHeight(row));
+            }
+            int oldRowHeight = table.getRowHeight(0);
+            model.setColumnIdentifiers(new Object[] {"Check", "it out!"});
+            for (int row = 0; row < table.getRowCount(); row++) {
+                System.out.println("After table rowHeight " + table.getRowHeight(row));
+            }
+            int curRowHeight = table.getRowHeight(0);
+            if (curRowHeight != oldRowHeight) {
+                throw new RuntimeException("DefaultTableModel.setColumnIdentifiers() Clears JTable Row Height");
+            }
+        });
+    }
+}