summaryrefslogtreecommitdiffstats
path: root/server/src/com
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-09-28 20:47:34 +0300
committerArtur Signell <artur@vaadin.com>2012-10-01 12:41:48 +0300
commitd371ac4a4e3f7f29f5a17f16c4134062c280115e (patch)
tree60d5ed0962932ac2ccc875c09d357b37cb4164d4 /server/src/com
parent41f2e9e753bb12372160a8cb2e8d2f68d7318d96 (diff)
downloadvaadin-framework-d371ac4a4e3f7f29f5a17f16c4134062c280115e.tar.gz
vaadin-framework-d371ac4a4e3f7f29f5a17f16c4134062c280115e.zip
Avoid adding RpcInvocationHandler toString as invocations (#9802)
Change-Id: If6f378c0942132110adc748bd2c1cf87779924b6
Diffstat (limited to 'server/src/com')
-rw-r--r--server/src/com/vaadin/server/AbstractClientConnector.java5
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;
}