From: Matti Tahvonen <matti.tahvonen@itmill.com>
Date: Wed, 7 May 2008 12:27:30 +0000 (+0000)
Subject: fixes #1486
X-Git-Tag: 6.7.0.beta1~4812
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c4fc4080116d190a6da04f744100a96f142a9e66;p=vaadin-framework.git

fixes #1486

svn changeset:4369/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java
index 0abb4233a4..848523b9a1 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IExpandLayout.java
@@ -690,7 +690,9 @@ public class IExpandLayout extends ComplexPanel implements
          * Expanded widget is updated after layout function so it has its
          * container fixed at the moment of updateFromUIDL.
          */
-        ((Paintable) expandedWidget).updateFromUIDL(expandedWidgetUidl, client);
-
+        if (expandedWidget != null) {
+            ((Paintable) expandedWidget).updateFromUIDL(expandedWidgetUidl,
+                    client);
+        }
     }
 }
diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java
index f24ddf686f..dc8f18ee67 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/ISlider.java
@@ -227,6 +227,9 @@ public class ISlider extends Widget implements Paintable,
     }
 
     private void setValue(Double value, boolean animate, boolean updateToServer) {
+        if (value == null) {
+            return;
+        }
         if (value.doubleValue() < min) {
             value = new Double(min);
         } else if (value.doubleValue() > max) {