1 files changed, 8 insertions, 3 deletions
diff --git a/server/src/com/vaadin/ui/AbstractSplitPanel.java b/server/src/com/vaadin/ui/AbstractSplitPanel.java
index 3a1b7ca35a..1c69ebf87e 100644
--- a/server/src/com/vaadin/ui/AbstractSplitPanel.java
+++ b/server/src/com/vaadin/ui/AbstractSplitPanel.java
@@ -186,7 +186,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
      * @return the first component of this split panel
      */
     public Component getFirstComponent() {
-        return (Component) getState().firstChild;
+        return (Component) getState(false).firstChild;
     }
 
     /**
@@ -196,7 +196,7 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
      * @return the second component of this split panel
      */
     public Component getSecondComponent() {
-        return (Component) getState().secondChild;
+        return (Component) getState(false).secondChild;
     }
 
     /**
@@ -534,7 +534,12 @@ public abstract class AbstractSplitPanel extends AbstractComponentContainer {
         return (AbstractSplitPanelState) super.getState();
     }
 
+    @Override
+    protected AbstractSplitPanelState getState(boolean markAsDirty) {
+        return (AbstractSplitPanelState) super.getState(markAsDirty);
+    }
+
     private SplitterState getSplitterState() {
-        return getState().splitterState;
+        return getState(false).splitterState;
     }
 }