summaryrefslogtreecommitdiffstats
path: root/client/src
diff options
context:
space:
mode:
authorHenri Sara <hesara@vaadin.com>2016-03-01 14:00:23 +0200
committerTeemu Suo-Anttila <teemusa@vaadin.com>2016-03-08 14:03:05 +0200
commitb651cca33d1a7e95dad50c17cda259b4bd56ae69 (patch)
tree0dfe76f254311a7205fb7d82108f77cb63544afc /client/src
parent39409784dfdce456d1e6e1054288c7e446c2cd49 (diff)
downloadvaadin-framework-b651cca33d1a7e95dad50c17cda259b4bd56ae69.tar.gz
vaadin-framework-b651cca33d1a7e95dad50c17cda259b4bd56ae69.zip
Omit timings in production mode (#19644)
* UIDL responses only include server side timing information when not in production mode. * Update documentation accordingly. Change-Id: I73e65057b0c9e8ccfce2a1ee2590f23fba2bdb22
Diffstat (limited to 'client/src')
-rw-r--r--client/src/com/vaadin/client/ApplicationConnection.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java
index ce55c13ce5..6830f21bcd 100644
--- a/client/src/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/client/ApplicationConnection.java
@@ -491,7 +491,11 @@ public class ApplicationConnection implements HasHandlers {
smh.@com.vaadin.client.communication.MessageHandler::lastProcessingTime,
smh.@com.vaadin.client.communication.MessageHandler::totalProcessingTime
];
- pd = pd.concat(smh.@com.vaadin.client.communication.MessageHandler::serverTimingInfo);
+ if (null != smh.@com.vaadin.client.communication.MessageHandler::serverTimingInfo) {
+ pd = pd.concat(smh.@com.vaadin.client.communication.MessageHandler::serverTimingInfo);
+ } else {
+ pd = pd.concat(-1, -1);
+ }
pd[pd.length] = smh.@com.vaadin.client.communication.MessageHandler::bootstrapTime;
return pd;
});