From efce86093f2dfc670129c2ecb5f975740085a074 Mon Sep 17 00:00:00 2001
From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Thu, 19 Apr 2007 11:17:05 +0000
Subject: [PATCH] fixes #618

svn changeset:1277/svn branch:trunk
---
 src/com/itmill/toolkit/ui/Table.java | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/com/itmill/toolkit/ui/Table.java b/src/com/itmill/toolkit/ui/Table.java
index ba40c43574..96d821be66 100644
--- a/src/com/itmill/toolkit/ui/Table.java
+++ b/src/com/itmill/toolkit/ui/Table.java
@@ -1293,20 +1293,22 @@ public class Table extends Select implements Action.Container,
 
 		// Sorting
 		boolean doSort = false;
-		if (variables.containsKey("sortcolumn")) {
-			String colId = (String) variables.get("sortcolumn");
-			if (colId != null && !"".equals(colId) && !"null".equals(colId)) {
-				Object id = this.columnIdMap.get(colId);
-				setSortContainerPropertyId(id);
-				doSort = true;
+		if(!this.sortDisabled) {
+			if (variables.containsKey("sortcolumn")) {
+				String colId = (String) variables.get("sortcolumn");
+				if (colId != null && !"".equals(colId) && !"null".equals(colId)) {
+					Object id = this.columnIdMap.get(colId);
+					setSortContainerPropertyId(id);
+					doSort = true;
+				}
 			}
-		}
-		if (variables.containsKey("sortascending")) {
-			boolean state = ((Boolean) variables.get("sortascending"))
-					.booleanValue();
-			if (state != this.sortAscending) {
-				setSortAscending(state);
-				doSort = true;
+			if (variables.containsKey("sortascending")) {
+				boolean state = ((Boolean) variables.get("sortascending"))
+						.booleanValue();
+				if (state != this.sortAscending) {
+					setSortAscending(state);
+					doSort = true;
+				}
 			}
 		}
 		if (doSort)
-- 
2.39.5