From aa2a9f7c6346357381db6f7f042ac54da382de00 Mon Sep 17 00:00:00 2001
From: Teemu Suo-Anttila <teemusa@vaadin.com>
Date: Mon, 14 Mar 2016 15:53:22 +0200
Subject: Add a default widgetset to look for in the project (#19675)

Change-Id: I39c303885b5712476780cb8fb7814763610eab47
---
 server/src/com/vaadin/server/UIProvider.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/server/src/com/vaadin/server/UIProvider.java b/server/src/com/vaadin/server/UIProvider.java
index 4ed86b9c31..7fd880919e 100644
--- a/server/src/com/vaadin/server/UIProvider.java
+++ b/server/src/com/vaadin/server/UIProvider.java
@@ -16,6 +16,7 @@
 
 package com.vaadin.server;
 
+import java.io.InputStream;
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.lang.annotation.Inherited;
@@ -30,6 +31,10 @@ import com.vaadin.shared.ui.ui.Transport;
 import com.vaadin.ui.UI;
 
 public abstract class UIProvider implements Serializable {
+
+    /* Default widgetset name to look for */
+    private static final String APP_WIDGETSET_NAME = "AppWidgetset";
+
     public abstract Class<? extends UI> getUIClass(UIClassSelectionEvent event);
 
     public UI createInstance(UICreateEvent event) {
@@ -136,8 +141,13 @@ public abstract class UIProvider implements Serializable {
         if (uiWidgetset != null) {
             return uiWidgetset.value();
         } else {
-            return null;
+            InputStream resource = event.getUIClass().getResourceAsStream(
+                    "/" + APP_WIDGETSET_NAME + ".gwt.xml");
+            if (resource != null) {
+                return APP_WIDGETSET_NAME;
+            }
         }
+        return null;
     }
 
     /**
-- 
cgit v1.2.3


From 3ea002e67fa0745080b844c8e29a6b55e8bac27b Mon Sep 17 00:00:00 2001
From: Henri Sara <hesara@vaadin.com>
Date: Wed, 16 Mar 2016 12:22:55 +0200
Subject: Allow system properties to override app properties (#19683)

This enables e.g. overriding the productionMode setting on a server
with -DproductionMode=true.

This change also allows the use of system properties prefixed
with "vaadin." or the full package name of the actual servlet class.

Change-Id: I196ae71f9d88222f98fe360add3e7038914b79d6
---
 WebContent/release-notes.html                              |  1 +
 .../com/vaadin/server/DefaultDeploymentConfiguration.java  | 14 ++++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html
index fc1d69fd24..828aa193b9 100644
--- a/WebContent/release-notes.html
+++ b/WebContent/release-notes.html
@@ -144,6 +144,7 @@
                 @Inherited. The annotation is also looked up in extended interfaces for backwards compatibility.</li>
             <li>Server-side timings of request processing are only sent to the client when not in production mode. Using the
                 timings in TestBench tests requires the server not to be in production mode.</li>
+            <li>System properties now override application parameters for settings such as production mode.</li>
         </ul>
         <h3 id="knownissues">Known Issues and Limitations</h3>
         <ul>
diff --git a/server/src/com/vaadin/server/DefaultDeploymentConfiguration.java b/server/src/com/vaadin/server/DefaultDeploymentConfiguration.java
index b26e048431..1f22a9e33d 100644
--- a/server/src/com/vaadin/server/DefaultDeploymentConfiguration.java
+++ b/server/src/com/vaadin/server/DefaultDeploymentConfiguration.java
@@ -125,14 +125,14 @@ public class DefaultDeploymentConfiguration extends
             String defaultValue) {
         String val = null;
 
-        // Try application properties
-        val = getApplicationProperty(propertyName);
+        // Try system properties
+        val = getSystemProperty(propertyName);
         if (val != null) {
             return val;
         }
 
-        // Try system properties
-        val = getSystemProperty(propertyName);
+        // Try application properties
+        val = getApplicationProperty(propertyName);
         if (val != null) {
             return val;
         }
@@ -175,6 +175,12 @@ public class DefaultDeploymentConfiguration extends
 
         // Try lowercased system properties
         val = System.getProperty(pkgName + parameterName.toLowerCase());
+        if (val != null) {
+            return val;
+        }
+
+        // version prefixed with just "vaadin."
+        val = System.getProperty("vaadin." + parameterName);
         return val;
     }
 
-- 
cgit v1.2.3


From a956fa4bebc2a273bf398d396c9fa23bf9bef1f9 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Wed, 13 Apr 2016 13:29:46 +0300
Subject: Make sure RPC queue is only flushed when there are pending
 invocations (#19684)

Change-Id: I95c47739fb785ed111642a41b0928a5dcde3fea2
---
 client/src/com/vaadin/client/communication/ServerRpcQueue.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/com/vaadin/client/communication/ServerRpcQueue.java b/client/src/com/vaadin/client/communication/ServerRpcQueue.java
index 2a9a8d4204..e5d5ea8a25 100644
--- a/client/src/com/vaadin/client/communication/ServerRpcQueue.java
+++ b/client/src/com/vaadin/client/communication/ServerRpcQueue.java
@@ -188,9 +188,10 @@ public class ServerRpcQueue {
      * Triggers a send of server RPC and legacy variable changes to the server.
      */
     public void flush() {
-        if (flushScheduled) {
+        if (flushScheduled || isEmpty()) {
             return;
         }
+
         flushPending = true;
         flushScheduled = true;
         Scheduler.get().scheduleFinally(scheduledFlushCommand);
-- 
cgit v1.2.3


From 0a5aa96ce132255128a6557b1b41ef9f16d75e26 Mon Sep 17 00:00:00 2001
From: elmot <elmot@vaadin.com>
Date: Thu, 14 Apr 2016 18:12:06 +0300
Subject: Add missing @since for 7.6.5

Change-Id: I985f85e51ea3522d534ae24517eac534012485ab
---
 .../com/vaadin/client/communication/ServerMessageHandlerTest.java   | 2 +-
 server/src/com/vaadin/server/communication/ServerRpcHandler.java    | 6 +++---
 server/src/com/vaadin/server/communication/UidlRequestHandler.java  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/tests/src/com/vaadin/client/communication/ServerMessageHandlerTest.java b/client/tests/src/com/vaadin/client/communication/ServerMessageHandlerTest.java
index c2752f1953..a87542e782 100644
--- a/client/tests/src/com/vaadin/client/communication/ServerMessageHandlerTest.java
+++ b/client/tests/src/com/vaadin/client/communication/ServerMessageHandlerTest.java
@@ -20,7 +20,7 @@ import org.junit.Test;
 
 /**
  * 
- * @since
+ * @since 7.6.5
  * @author Vaadin Ltd
  */
 public class ServerMessageHandlerTest {
diff --git a/server/src/com/vaadin/server/communication/ServerRpcHandler.java b/server/src/com/vaadin/server/communication/ServerRpcHandler.java
index 3503a2d8b1..6376635c13 100644
--- a/server/src/com/vaadin/server/communication/ServerRpcHandler.java
+++ b/server/src/com/vaadin/server/communication/ServerRpcHandler.java
@@ -324,7 +324,7 @@ public class ServerRpcHandler implements Serializable {
      * @param invocationsData
      *            JSON containing all information needed to execute all
      *            requested RPC calls.
-     * @since
+     * @since 7.6.5
      */
     protected void handleInvocations(UI ui, int lastSyncIdSeenByClient,
             JsonArray invocationsData) {
@@ -423,7 +423,7 @@ public class ServerRpcHandler implements Serializable {
     /**
      * Handles the given RPC method invocation for the given connector
      * 
-     * @since
+     * @since 7.6.5
      * @param ui
      *            the UI containing the connector
      * @param connector
@@ -446,7 +446,7 @@ public class ServerRpcHandler implements Serializable {
      * Handles the given Legacy variable change RPC method invocation for the
      * given connector
      * 
-     * @since
+     * @since 7.6.5
      * @param ui
      *            the UI containing the connector
      * @param connector
diff --git a/server/src/com/vaadin/server/communication/UidlRequestHandler.java b/server/src/com/vaadin/server/communication/UidlRequestHandler.java
index db18bb9e1e..58d9a8c6f0 100644
--- a/server/src/com/vaadin/server/communication/UidlRequestHandler.java
+++ b/server/src/com/vaadin/server/communication/UidlRequestHandler.java
@@ -60,7 +60,7 @@ public class UidlRequestHandler extends SynchronizedRequestHandler implements
     /**
      * Creates the ServerRpcHandler to use
      * 
-     * @since
+     * @since 7.6.5
      * @return the ServerRpcHandler to use
      */
     protected ServerRpcHandler createRpcHandler() {
-- 
cgit v1.2.3


From f55691ea87efa446da94bbe313afae9835619f87 Mon Sep 17 00:00:00 2001
From: elmot <elmot@vaadin.com>
Date: Fri, 15 Apr 2016 11:25:33 +0300
Subject: Add javadoc and @since for new API

Change-Id: I5c6be2ae0fdaff8b6b6169d6a1110ae824472532
(cherry picked from commit 97741f4545e5f246e7b1af01270abc832b9cf3ab)
---
 .../com/vaadin/server/widgetsetutils/ClassPathExplorer.java    |  2 ++
 shared/src/com/vaadin/shared/ui/MarginInfo.java                | 10 ++++++++++
 2 files changed, 12 insertions(+)

diff --git a/server/src/com/vaadin/server/widgetsetutils/ClassPathExplorer.java b/server/src/com/vaadin/server/widgetsetutils/ClassPathExplorer.java
index 255f34d936..45bd3751d3 100644
--- a/server/src/com/vaadin/server/widgetsetutils/ClassPathExplorer.java
+++ b/server/src/com/vaadin/server/widgetsetutils/ClassPathExplorer.java
@@ -506,6 +506,8 @@ public class ClassPathExplorer {
      * directory (not a JAR file etc.) on the classpath.
      * 
      * TODO this could be done better...
+     *
+     * @since 7.6.5
      * 
      * @param widgetsetFileName
      *            relative path for the widgetset
diff --git a/shared/src/com/vaadin/shared/ui/MarginInfo.java b/shared/src/com/vaadin/shared/ui/MarginInfo.java
index 92f7956015..c66d1f0a11 100644
--- a/shared/src/com/vaadin/shared/ui/MarginInfo.java
+++ b/shared/src/com/vaadin/shared/ui/MarginInfo.java
@@ -71,6 +71,16 @@ public class MarginInfo implements Serializable {
         doSetMargins(top, right, bottom, left);
     }
 
+    /**
+     * Creates a MarginInfo object by having horizontal and vertical margins specified (analogous to CSS).
+     *
+     * @since 7.6.5
+     *
+     * @param vertical
+     *            enable or disable top and bottom margins
+     * @param horizontal
+     *            enable or disable left and right margins
+     */
     public MarginInfo(boolean vertical, boolean horizontal) {
         this(vertical, horizontal, vertical, horizontal);
     }
-- 
cgit v1.2.3


From 23dac22b45c6f7d5ad534450e32a24cdb21d5ed1 Mon Sep 17 00:00:00 2001
From: elmot <elmot@vaadin.com>
Date: Fri, 15 Apr 2016 10:58:58 +0300
Subject: Change @since from 7.6.5 to 7.7 - new API is not released in
 maintenance release

Change-Id: Ia8cec8bb9d4bd89d8f0609df19dedcc10ab46bdd
---
 .../com/vaadin/client/communication/ServerMessageHandlerTest.java   | 2 +-
 server/src/com/vaadin/server/communication/ServerRpcHandler.java    | 6 +++---
 server/src/com/vaadin/server/communication/UidlRequestHandler.java  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/tests/src/com/vaadin/client/communication/ServerMessageHandlerTest.java b/client/tests/src/com/vaadin/client/communication/ServerMessageHandlerTest.java
index a87542e782..7b0d886c39 100644
--- a/client/tests/src/com/vaadin/client/communication/ServerMessageHandlerTest.java
+++ b/client/tests/src/com/vaadin/client/communication/ServerMessageHandlerTest.java
@@ -20,7 +20,7 @@ import org.junit.Test;
 
 /**
  * 
- * @since 7.6.5
+ * @since 7.7
  * @author Vaadin Ltd
  */
 public class ServerMessageHandlerTest {
diff --git a/server/src/com/vaadin/server/communication/ServerRpcHandler.java b/server/src/com/vaadin/server/communication/ServerRpcHandler.java
index 6376635c13..be261ede92 100644
--- a/server/src/com/vaadin/server/communication/ServerRpcHandler.java
+++ b/server/src/com/vaadin/server/communication/ServerRpcHandler.java
@@ -324,7 +324,7 @@ public class ServerRpcHandler implements Serializable {
      * @param invocationsData
      *            JSON containing all information needed to execute all
      *            requested RPC calls.
-     * @since 7.6.5
+     * @since 7.7
      */
     protected void handleInvocations(UI ui, int lastSyncIdSeenByClient,
             JsonArray invocationsData) {
@@ -423,7 +423,7 @@ public class ServerRpcHandler implements Serializable {
     /**
      * Handles the given RPC method invocation for the given connector
      * 
-     * @since 7.6.5
+     * @since 7.7
      * @param ui
      *            the UI containing the connector
      * @param connector
@@ -446,7 +446,7 @@ public class ServerRpcHandler implements Serializable {
      * Handles the given Legacy variable change RPC method invocation for the
      * given connector
      * 
-     * @since 7.6.5
+     * @since 7.7
      * @param ui
      *            the UI containing the connector
      * @param connector
diff --git a/server/src/com/vaadin/server/communication/UidlRequestHandler.java b/server/src/com/vaadin/server/communication/UidlRequestHandler.java
index 58d9a8c6f0..20b906c3e6 100644
--- a/server/src/com/vaadin/server/communication/UidlRequestHandler.java
+++ b/server/src/com/vaadin/server/communication/UidlRequestHandler.java
@@ -60,7 +60,7 @@ public class UidlRequestHandler extends SynchronizedRequestHandler implements
     /**
      * Creates the ServerRpcHandler to use
      * 
-     * @since 7.6.5
+     * @since 7.7
      * @return the ServerRpcHandler to use
      */
     protected ServerRpcHandler createRpcHandler() {
-- 
cgit v1.2.3


From acba4ff413db5a6e68b85c4e7dd72d76cc7367f6 Mon Sep 17 00:00:00 2001
From: Alejandro Duarte <alejandro@vaadin.com>
Date: Mon, 18 Apr 2016 12:15:43 +0300
Subject: Fixed typo in tutorial

Change-Id: I9f49acded4bc36e0a7ae789729eaa2b50859b614
---
 documentation/tutorial.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/documentation/tutorial.adoc b/documentation/tutorial.adoc
index fa8ceecfed..cc70a762bc 100644
--- a/documentation/tutorial.adoc
+++ b/documentation/tutorial.adoc
@@ -712,7 +712,7 @@ private Button save = new Button("Save");
 private Button delete = new Button("Delete");
 ----
 
-Also, we will laterneed a reference to the currently edited Customer object,
+Also, we will later need a reference to the currently edited Customer object,
 CustomerService and the MyUI that uses this class. Add these fields and a
 basic constructor that accepts MyUI as a parameter to the CustomerForm class:
 
-- 
cgit v1.2.3


From 871960c70866e3c70eeaedfa20b1a1b6917f68fa Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Fri, 15 Apr 2016 18:39:10 +0300
Subject: Only handle shortcuts targeted for UI or body element (#19498)

Change-Id: I796d7e4ac94db1b2b9d8698e9753a5be007a1c8c
---
 .../src/com/vaadin/client/ui/ui/UIConnector.java   | 12 +++-
 .../tests/components/ui/WindowAndUIShortcuts.java  | 76 ++++++++++++++++++++++
 .../components/ui/WindowAndUIShortcutsTest.java    | 43 ++++++++++++
 3 files changed, 129 insertions(+), 2 deletions(-)
 create mode 100644 uitest/src/com/vaadin/tests/components/ui/WindowAndUIShortcuts.java
 create mode 100644 uitest/src/com/vaadin/tests/components/ui/WindowAndUIShortcutsTest.java

diff --git a/client/src/com/vaadin/client/ui/ui/UIConnector.java b/client/src/com/vaadin/client/ui/ui/UIConnector.java
index 9ffb9cfba9..6f4872729d 100644
--- a/client/src/com/vaadin/client/ui/ui/UIConnector.java
+++ b/client/src/com/vaadin/client/ui/ui/UIConnector.java
@@ -507,8 +507,16 @@ public class UIConnector extends AbstractSingleComponentContainerConnector
             @Override
             public void onKeyDown(KeyDownEvent event) {
                 if (getWidget().actionHandler != null) {
-                    getWidget().actionHandler.handleKeyboardEvent((Event) event
-                            .getNativeEvent().cast());
+                    Element target = Element.as(event.getNativeEvent()
+                            .getEventTarget());
+                    if (target == Document.get().getBody()
+                            || getWidget().getElement().isOrHasChild(target)) {
+                        // Only react to body and elements inside the UI
+                        getWidget().actionHandler
+                                .handleKeyboardEvent((Event) event
+                                        .getNativeEvent().cast());
+                    }
+
                 }
             }
         }, KeyDownEvent.getType());
diff --git a/uitest/src/com/vaadin/tests/components/ui/WindowAndUIShortcuts.java b/uitest/src/com/vaadin/tests/components/ui/WindowAndUIShortcuts.java
new file mode 100644
index 0000000000..c5c9c16e2d
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/ui/WindowAndUIShortcuts.java
@@ -0,0 +1,76 @@
+package com.vaadin.tests.components.ui;
+
+import com.vaadin.annotations.Theme;
+import com.vaadin.event.ShortcutAction;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.ui.Button;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Notification;
+import com.vaadin.ui.TextField;
+import com.vaadin.ui.UI;
+import com.vaadin.ui.VerticalLayout;
+import com.vaadin.ui.Window;
+import com.vaadin.ui.themes.ValoTheme;
+
+@Theme(ValoTheme.THEME_NAME)
+public class WindowAndUIShortcuts extends UI {
+
+    @Override
+    protected void init(VaadinRequest request) {
+        VerticalLayout layout = new VerticalLayout();
+        layout.setSizeFull();
+        layout.setMargin(true);
+
+        final VerticalLayout mainLayout = new VerticalLayout();
+
+        mainLayout.addComponent(new Button("Show page",
+                new Button.ClickListener() {
+                    @Override
+                    public void buttonClick(Button.ClickEvent clickEvent) {
+                        final VerticalLayout pageLayout = new VerticalLayout();
+                        pageLayout.setSpacing(true);
+
+                        pageLayout.addComponent(new Label("Page"));
+                        pageLayout.addComponent(new Button(
+                                "Open dialog window",
+                                new Button.ClickListener() {
+                                    @Override
+                                    public void buttonClick(
+                                            Button.ClickEvent clickEvent) {
+                                        Window dialog = new Window();
+                                        dialog.setModal(true);
+                                        dialog.setCaption("Press ESC shortcut");
+                                        dialog.setWidth("300px");
+                                        dialog.setHeight("100px");
+
+                                        dialog.setContent(new TextField(
+                                                "TextField in window"));
+                                        addWindow(dialog);
+                                    }
+                                }));
+                        Button closeButton = new Button("Close page",
+                                new Button.ClickListener() {
+                                    @Override
+                                    public void buttonClick(
+                                            Button.ClickEvent clickEvent) {
+                                        mainLayout.removeComponent(pageLayout);
+
+                                        Notification
+                                                .show("OMG! Page is also closed!");
+                                    }
+                                });
+                        closeButton
+                                .setClickShortcut(ShortcutAction.KeyCode.ESCAPE);
+                        pageLayout.addComponent(closeButton);
+
+                        mainLayout.addComponent(pageLayout);
+                        mainLayout.setExpandRatio(pageLayout, 1);
+                    }
+                }));
+
+        layout.addComponent(mainLayout);
+        layout.setExpandRatio(mainLayout, 1);
+
+        setContent(layout);
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/components/ui/WindowAndUIShortcutsTest.java b/uitest/src/com/vaadin/tests/components/ui/WindowAndUIShortcutsTest.java
new file mode 100644
index 0000000000..93324f0792
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/components/ui/WindowAndUIShortcutsTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.components.ui;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.Keys;
+
+import com.vaadin.testbench.elements.ButtonElement;
+import com.vaadin.testbench.elements.TextFieldElement;
+import com.vaadin.testbench.elements.WindowElement;
+import com.vaadin.tests.tb3.SingleBrowserTest;
+
+public class WindowAndUIShortcutsTest extends SingleBrowserTest {
+
+    @Test
+    public void windowShortcutShouldNotReachUI() {
+        openTestURL();
+        $(ButtonElement.class).caption("Show page").first().click();
+        $(ButtonElement.class).caption("Open dialog window").first().click();
+
+        WindowElement window = $(WindowElement.class).first();
+        window.$(TextFieldElement.class).first().sendKeys(Keys.ESCAPE);
+
+        // Window should have been closed
+        Assert.assertTrue($(WindowElement.class).all().isEmpty());
+        // "Close page" should not have been clicked
+        Assert.assertTrue($(ButtonElement.class).caption("Close page").exists());
+    }
+}
-- 
cgit v1.2.3


From 9ac0f05066dad8beecf12a8e663b13b93cece140 Mon Sep 17 00:00:00 2001
From: Markus Koivisto <markus@vaadin.com>
Date: Tue, 19 Apr 2016 15:14:08 +0300
Subject: Fix Chrome version string

Change-Id: I488785bfde5edf83564a5e0f426dca9cd99ca373
---
 uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java b/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java
index a64df1e724..2a66b6f1f4 100644
--- a/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java
+++ b/uitest/src/com/vaadin/tests/VerifyBrowserVersionTest.java
@@ -39,8 +39,9 @@ public class VerifyBrowserVersionTest extends MultiBrowserTest {
         if (BrowserUtil.isChrome(getDesiredCapabilities())) {
             // Chrome version does not necessarily match the desired version
             // because of auto updates...
-            browserIdentifier = getExpectedUserAgentString(getDesiredCapabilities())
-                    + "48";
+            // TODO - replace fixed number with a range?
+            browserIdentifier = getExpectedUserAgentString(
+                    getDesiredCapabilities()) + "49";
         } else {
             browserIdentifier = getExpectedUserAgentString(desiredCapabilities)
                     + desiredCapabilities.getVersion();
-- 
cgit v1.2.3


From fe530b84f06f4103a6499a13ac7c66cdb3c3cfd9 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Sun, 13 Mar 2016 13:27:38 +0200
Subject: Ensure getItemProperty returns null for unknown property ids (#7103)

Change-Id: I77e826f81f2469badf35462ba40f0e8d73e48245
---
 server/src/com/vaadin/data/util/IndexedContainer.java                | 4 ++++
 server/tests/src/com/vaadin/data/util/AbstractContainerTestBase.java | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/server/src/com/vaadin/data/util/IndexedContainer.java b/server/src/com/vaadin/data/util/IndexedContainer.java
index b851baf674..8783c061ac 100644
--- a/server/src/com/vaadin/data/util/IndexedContainer.java
+++ b/server/src/com/vaadin/data/util/IndexedContainer.java
@@ -741,6 +741,10 @@ public class IndexedContainer extends
          */
         @Override
         public Property getItemProperty(Object id) {
+            if (!propertyIds.contains(id)) {
+                return null;
+            }
+
             return new IndexedContainerProperty(itemId, id);
         }
 
diff --git a/server/tests/src/com/vaadin/data/util/AbstractContainerTestBase.java b/server/tests/src/com/vaadin/data/util/AbstractContainerTestBase.java
index 52acc5ab76..5fd4f8ae17 100644
--- a/server/tests/src/com/vaadin/data/util/AbstractContainerTestBase.java
+++ b/server/tests/src/com/vaadin/data/util/AbstractContainerTestBase.java
@@ -149,6 +149,10 @@ public abstract class AbstractContainerTestBase extends TestCase {
 
         }
 
+        // getItemProperty
+        Assert.assertNull(container.getItem(itemIdInSet).getItemProperty(
+                "notinset"));
+
     }
 
     protected static final Object FULLY_QUALIFIED_NAME = "fullyQualifiedName";
-- 
cgit v1.2.3