From 2cb32194f623c45cf5e8eed47ccf69a372eda813 Mon Sep 17 00:00:00 2001
From: Johannes Dahlström <johannesd@vaadin.com>
Date: Thu, 11 Apr 2013 18:26:51 +0300
Subject: Fix minor issues raised in #111 code review

Change-Id: Ibca25fea1d08e98271e68e3d4703afe5aeaae182
---
 client/src/com/vaadin/client/ApplicationConnection.java | 4 ++--
 server/src/com/vaadin/ui/UI.java                        | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java
index 2cc5a85996..ce57dc5bca 100644
--- a/client/src/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/client/ApplicationConnection.java
@@ -870,7 +870,7 @@ public class ApplicationConnection {
      * @param jsonText
      * @param statusCode
      */
-    public void handleJSONText(String jsonText, int statusCode) {
+    protected void handleJSONText(String jsonText, int statusCode) {
         final Date start = new Date();
         final ValueMap json;
         try {
@@ -974,7 +974,7 @@ public class ApplicationConnection {
      * servicing the session so far. These values are always one request behind,
      * since they cannot be measured before the request is finished.
      */
-    public ValueMap serverTimingInfo;
+    private ValueMap serverTimingInfo;
 
     static final int MAX_CSS_WAITS = 100;
 
diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index 6160978542..303dfc234a 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -1177,6 +1177,8 @@ public abstract class UI extends AbstractSingleComponentContainer implements
      * should only be called by the framework.
      */
     public void setPushConnection(PushConnection connection) {
+        assert pushConnection == null;
+        assert connection != null;
         pushConnection = connection;
     }
 
-- 
cgit v1.2.3