Merge changes from origin/7.1

8245079 Decrease the websocket buffer size due to a Jetty 9.1 issue (#13087)
ea8f381 Show the widgetset name to more easily spot misconfigurations
797ebdf Allow user to override Atmosphere init params set by Vaadin (#13088)
65c2f2b Properly remove shadow event listeners to prevent IE8 memory leak (#13129)
e9a547a Fixed spelling mistake in log message.
0b95f8d Moved selection of selected rows in TableConnector to occur after the new rows are created (#13008)
0579fba Upload control with empty selection (#9602)
db4dba4 Ensure event listener is a widget before casting #13130
5e8e866 Changes padding for Textfields with Chameleon theme. (#12974)
171e68d Only use ClientRcp and ServerRpc types that are interfaces (#13056)
e41a2ce Add helper for adding multiple components to AbstractTestUI
407bdb3 Ignores scroll events while update from server is in progress (#11454)

Change-Id: I5d21b4071165b02da0f53bd055fb1c64e90cae5b

1 files changed, 6 insertions, 2 deletions

diff --git a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
index cbdd3e89aa..4d6a7ff6d7 100644
--- a/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
+++ b/client-compiler/src/com/vaadin/server/widgetsetutils/metadata/ConnectorBundle.java
@@ -430,11 +430,11 @@ public class ConnectorBundle {
     }
 
     private static boolean isClientRpc(JClassType type) {
-        return isType(type, ClientRpc.class);
+        return isInterfaceType(type, ClientRpc.class);
     }
 
     private static boolean isServerRpc(JClassType type) {
-        return isType(type, ServerRpc.class);
+        return isInterfaceType(type, ServerRpc.class);
     }
 
     public static boolean isConnectedConnector(JClassType type) {
@@ -451,6 +451,10 @@ public class ConnectorBundle {
         return isConnected(type) && isType(type, ComponentConnector.class);
     }
 
+    private static boolean isInterfaceType(JClassType type, Class<?> class1) {
+        return type.isInterface() != null && isType(type, class1);
+    }
+
     private static boolean isType(JClassType type, Class<?> class1) {
         try {
             return type.getOracle().getType(class1.getName())