Merge "Avoid adding RpcInvocationHandler toString as invocations (#9802)"

1 files changed, 5 insertions, 0 deletions

diff --git a/server/src/com/vaadin/server/AbstractClientConnector.java b/server/src/com/vaadin/server/AbstractClientConnector.java
index eb59cbe5fc..1f0d3049b5 100644
--- a/server/src/com/vaadin/server/AbstractClientConnector.java
+++ b/server/src/com/vaadin/server/AbstractClientConnector.java
@@ -290,6 +290,11 @@ public abstract class AbstractClientConnector implements ClientConnector {
         @Override
         public Object invoke(Object proxy, Method method, Object[] args)
                 throws Throwable {
+            if (method.getDeclaringClass() == Object.class) {
+                // Don't add Object methods such as toString and hashCode as
+                // invocations
+                return method.invoke(this, args);
+            }
             addMethodInvocationToQueue(rpcInterfaceName, method, args);
             return null;
         }