Fix for #5186

svn changeset:13756/svn branch:6.4

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index cf7d012919756934f6f4e3227c8711109c46401e..1edaf092a65a0bf4f7e5b9952bbe0b771bee0abc 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -1061,10 +1061,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
         scrollBody.setColWidth(colIndex, w);
 
         // Set footer column width
-        final FooterCell fcell = tFoot.getFooterCell(colIndex);
-        if (fcell != null) {
-            fcell.setWidth(w, isDefinedWidth);
-        }
+        FooterCell fcell = tFoot.getFooterCell(colIndex);
+        fcell.setWidth(w, isDefinedWidth);
     }
 
     private int getColWidth(String colKey) {
@@ -2543,11 +2541,11 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
             if (width == w) {
                 return;
             }
-            width = w;
-            if (width <= 0) {
+            if (width == -1) {
                 // go to default mode, clip content if necessary
                 DOM.setStyleAttribute(captionContainer, "overflow", "");
             }
+            width = w;
             if (w == -1) {
                 DOM.setStyleAttribute(captionContainer, "width", "");
                 setWidth("");