From 08b7ea5b1f9a4f5d31b5559d557d36727ea1d26e Mon Sep 17 00:00:00 2001
From: Anna Koskinen <anna@vaadin.com>
Date: Fri, 11 Jan 2013 14:05:46 +0200
Subject: [PATCH] Merge of (#9133) to Vaadin 7.

Sort optimization.

Change-Id: I2b75de400acde7fe23574d6439b75e6f05b4eb55
---
 server/src/com/vaadin/ui/Table.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/src/com/vaadin/ui/Table.java b/server/src/com/vaadin/ui/Table.java
index 57f196d704..e73c6d7188 100644
--- a/server/src/com/vaadin/ui/Table.java
+++ b/server/src/com/vaadin/ui/Table.java
@@ -4427,9 +4427,12 @@ public class Table extends AbstractSelect implements Action.Container,
         final Container c = getContainerDataSource();
         if (c instanceof Container.Sortable) {
             final int pageIndex = getCurrentPageFirstItemIndex();
+            boolean refreshingPreviouslyEnabled = disableContentRefreshing();
             ((Container.Sortable) c).sort(propertyId, ascending);
             setCurrentPageFirstItemIndex(pageIndex);
-            refreshRowCache();
+            if (refreshingPreviouslyEnabled) {
+                enableContentRefreshing(true);
+            }
 
         } else if (c != null) {
             throw new UnsupportedOperationException(
-- 
2.39.5