#8019 Did a bunch of null checks for possible faulty null states which was not possible when we still used primitives.

1 files changed, 8 insertions, 2 deletions

diff --git a/src/com/vaadin/ui/AbstractComponent.java b/src/com/vaadin/ui/AbstractComponent.java
index 4b9449c598..026b64299a 100644
--- a/src/com/vaadin/ui/AbstractComponent.java
+++ b/src/com/vaadin/ui/AbstractComponent.java
@@ -1324,9 +1324,12 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#setHeight(float, int)
+     * @see com.vaadin.terminal.Sizeable#setHeight(float, Unit)
      */
     public void setHeight(float height, Unit unit) {
+        if (unit == null) {
+            throw new IllegalArgumentException("Unit can not be null");
+        }
         this.height = height;
         heightUnit = unit;
         requestRepaint();
@@ -1356,9 +1359,12 @@ public abstract class AbstractComponent implements Component, MethodEventSource
     /*
      * (non-Javadoc)
      * 
-     * @see com.vaadin.terminal.Sizeable#setWidth(float, int)
+     * @see com.vaadin.terminal.Sizeable#setWidth(float, Unit)
      */
     public void setWidth(float width, Unit unit) {
+        if (unit == null) {
+            throw new IllegalArgumentException("Unit can not be null");
+        }
         this.width = width;
         widthUnit = unit;
         requestRepaint();