Merge commit '17c14'

Conflicts:
	src/com/vaadin/Application.java
	src/com/vaadin/data/util/MethodPropertyDescriptor.java
	src/com/vaadin/data/util/sqlcontainer/SQLContainer.java
	src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
	src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
	src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
	src/com/vaadin/terminal/gwt/server/DragAndDropService.java
	src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java
	src/com/vaadin/terminal/gwt/widgetsetutils/ClassPathExplorer.java
	src/com/vaadin/ui/Table.java
	tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java

1 files changed, 10 insertions, 3 deletions

diff --git a/src/com/vaadin/Application.java b/src/com/vaadin/Application.java
index 4da1d52c00..58ad4da684 100644
--- a/src/com/vaadin/Application.java
+++ b/src/com/vaadin/Application.java
@@ -1066,12 +1066,14 @@ public class Application implements Terminal.ErrorListener, Serializable {
      *            the change event.
      * @see com.vaadin.terminal.Terminal.ErrorListener#terminalError(com.vaadin.terminal.Terminal.ErrorEvent)
      */
+    @Override
     public void terminalError(Terminal.ErrorEvent event) {
         final Throwable t = event.getThrowable();
         if (t instanceof SocketException) {
             // Most likely client browser closed socket
-            logger.info("SocketException in CommunicationManager."
-                    + " Most likely client (browser) closed socket.");
+            getLogger().info(
+                    "SocketException in CommunicationManager."
+                            + " Most likely client (browser) closed socket.");
             return;
         }
 
@@ -1090,7 +1092,7 @@ public class Application implements Terminal.ErrorListener, Serializable {
         }
 
         // also print the error on console
-        logger.log(Level.SEVERE, "Terminal error:", t);
+        getLogger().log(Level.SEVERE, "Terminal error:", t);
     }
 
     /**
@@ -1809,6 +1811,7 @@ public class Application implements Terminal.ErrorListener, Serializable {
             this.throwable = throwable;
         }
 
+        @Override
         public Throwable getThrowable() {
             return throwable;
         }
@@ -2416,4 +2419,8 @@ public class Application implements Terminal.ErrorListener, Serializable {
         }
 
     }
+
+    private static final Logger getLogger() {
+        return Logger.getLogger(Application.class.getName());
+    }
 }