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 0abb4233a4f811c0ddb0b0e1eeb97ba3edf558df..848523b9a1227a8ca4fab0380fd712262549915f 100644 (file)
--- 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 f24ddf686fc7b3a0060bcc13388d2450bef371f8..dc8f18ee6761c67dd0b7a42d1b5ba252e7ccf77e 100644 (file)
--- 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,
     }\r
 \r
     private void setValue(Double value, boolean animate, boolean updateToServer) {\r
+        if (value == null) {\r
+            return;\r
+        }\r
         if (value.doubleValue() < min) {\r
             value = new Double(min);\r
         } else if (value.doubleValue() > max) {\r