--- a/thread/client-swing/src/main/java/com/redhat/thermostat/thread/client/swing/impl/SwingThreadTableView.java	Fri Dec 18 10:04:12 2015 -0500
+++ b/thread/client-swing/src/main/java/com/redhat/thermostat/thread/client/swing/impl/SwingThreadTableView.java	Thu Jun 23 15:59:55 2016 +0200
@@ -129,13 +129,23 @@
         SwingUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
+                beans.clear();
+
                 ThreadViewTableModel model = (ThreadViewTableModel) table.getModel();
-                model.setRowCount(0);
-                beans.clear();
+                model.clear();
             }
         });
     }
 
+    Map<ThreadTableBean, Integer> getBeans() {
+        return beans;
+    }
+
+    List<ThreadTableBean> getInfos() {
+        ThreadViewTableModel model = (ThreadViewTableModel) table.getModel();
+        return model.infos;
+    }
+
     @Override
     public Component getUiComponent() {
         return tablePanel;
@@ -237,7 +247,12 @@
             }
             return infos.size();
         }
-        
+
+        void clear() {
+            infos.clear();
+            setRowCount(0);
+        }
+
         @Override
         public Class<?> getColumnClass(int column) {
             switch (column) {

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/thread/client-swing/src/test/java/com/redhat/thermostat/thread/client/swing/impl/SwingThreadTableViewTest.java	Thu Jun 23 15:59:55 2016 +0200
@@ -0,0 +1,124 @@
+/*
+ * Copyright 2012-2016 Red Hat, Inc.
+ *
+ * This file is part of Thermostat.
+ *
+ * Thermostat is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2, or (at your
+ * option) any later version.
+ *
+ * Thermostat 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 for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Thermostat; see the file COPYING.  If not see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Linking this code with other modules is making a combined work
+ * based on this code.  Thus, the terms and conditions of the GNU
+ * General Public License cover the whole combination.
+ *
+ * As a special exception, the copyright holders of this code give
+ * you permission to link this code with independent modules to
+ * produce an executable, regardless of the license terms of these
+ * independent modules, and to copy and distribute the resulting
+ * executable under terms of your choice, provided that you also
+ * meet, for each linked independent module, the terms and conditions
+ * of the license of that module.  An independent module is a module
+ * which is not derived from or based on this code.  If you modify
+ * this code, you may extend this exception to your version of the
+ * library, but you are not obligated to do so.  If you do not wish
+ * to do so, delete this exception statement from your version.
+ */
+
+package com.redhat.thermostat.thread.client.swing.impl;
+
+import com.redhat.thermostat.annotations.internal.CacioTest;
+import com.redhat.thermostat.test.Bug;
+import com.redhat.thermostat.thread.client.common.ThreadTableBean;
+import com.redhat.thermostat.thread.client.swing.impl.SwingThreadTableView;
+import net.java.openjdk.cacio.ctc.junit.CacioFESTRunner;
+import org.fest.swing.annotation.GUITest;
+import org.fest.swing.edt.GuiActionRunner;
+import org.fest.swing.edt.GuiTask;
+import org.fest.swing.fixture.FrameFixture;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+
+import javax.swing.JFrame;
+import javax.swing.SwingUtilities;
+
+import java.awt.Component;
+import java.awt.Toolkit;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.mock;
+
+/**
+ */
+@Category(CacioTest.class)
+@RunWith(CacioFESTRunner.class)
+public class SwingThreadTableViewTest {
+
+    private SwingThreadTableView view;
+    private JFrame frame;
+    private FrameFixture frameFixture;
+
+    @Before
+    public void setUp() {
+        GuiActionRunner.execute(new GuiTask() {
+            @Override
+            protected void executeInEDT() throws Throwable {
+                view = new SwingThreadTableView();
+                frame = new JFrame();
+                frame.add(view.getUiComponent());
+            }
+        });
+        frameFixture = new FrameFixture(frame);
+    }
+
+    @Bug(id = "3027",
+            summary = "ThreadTableView displays the last thread states even when older sessions are selected",
+            url = "http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=3027")
+    @Test
+    @Category(GUITest.class)
+    @GUITest
+    public void clearView() throws Exception {
+
+        ThreadTableBean bean0 = mock(ThreadTableBean.class);
+
+        frameFixture.show();
+
+        view.display(bean0);
+        view.submitChanges();
+
+        SwingUtilities.invokeAndWait(new Runnable() {
+            @Override
+            public void run() {
+                // just flush pending events
+            }
+        });
+
+        assertTrue(view.getBeans().containsKey(bean0));
+        assertTrue(view.getInfos().contains(bean0));
+
+        view.clear();
+        view.submitChanges();
+
+        SwingUtilities.invokeAndWait(new Runnable() {
+            @Override
+            public void run() {
+                // just flush pending events
+            }
+        });
+
+        assertFalse(view.getBeans().containsKey(bean0));
+        assertFalse(view.getInfos().contains(bean0));
+    }
+}