Merge branch 'master' into 7.3 and update release notes (#14105)

Change-Id: I0c7f4ac1528dda9d1ebde724854bab84092e0c10

1 files changed, 7 insertions, 2 deletions

diff --git a/server/src/com/vaadin/ui/PopupDateField.java b/server/src/com/vaadin/ui/PopupDateField.java
index 61aac16a97..f07ac84160 100644
--- a/server/src/com/vaadin/ui/PopupDateField.java
+++ b/server/src/com/vaadin/ui/PopupDateField.java
@@ -93,6 +93,11 @@ public class PopupDateField extends DateField {
         return (PopupDateFieldState) super.getState();
     }
 
+    @Override
+    protected PopupDateFieldState getState(boolean markAsDirty) {
+        return (PopupDateFieldState) super.getState(markAsDirty);
+    }
+
     /**
      * Checks whether the text field is enabled (default) or not.
      * 
@@ -101,7 +106,7 @@ public class PopupDateField extends DateField {
      * @return <b>true</b> if the text field is enabled, <b>false</b> otherwise.
      */
     public boolean isTextFieldEnabled() {
-        return getState().textFieldEnabled;
+        return getState(false).textFieldEnabled;
     }
 
     /**
@@ -136,6 +141,6 @@ public class PopupDateField extends DateField {
      * @return String with the description
      */
     public String getAssistiveText() {
-        return getState().descriptionForAssistiveDevices;
+        return getState(false).descriptionForAssistiveDevices;
     }
 }