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, 9 insertions, 6 deletions

diff --git a/src/com/vaadin/data/util/MethodPropertyDescriptor.java b/src/com/vaadin/data/util/MethodPropertyDescriptor.java
index 10faa7a0f3..a2a76ec6cf 100644
--- a/src/com/vaadin/data/util/MethodPropertyDescriptor.java
+++ b/src/com/vaadin/data/util/MethodPropertyDescriptor.java
@@ -23,9 +23,6 @@ import com.vaadin.util.SerializerHelper;
 public class MethodPropertyDescriptor<BT> implements
         VaadinPropertyDescriptor<BT> {
 
-    private static final Logger logger = Logger
-            .getLogger(MethodPropertyDescriptor.class.getName());
-
     private final String name;
     private Class<?> propertyType;
     private transient Method readMethod;
@@ -109,23 +106,29 @@ public class MethodPropertyDescriptor<BT> implements
                 readMethod = null;
             }
         } catch (SecurityException e) {
-            logger.log(Level.SEVERE, "Internal deserialization error", e);
+            getLogger().log(Level.SEVERE, "Internal deserialization error", e);
         } catch (NoSuchMethodException e) {
-            logger.log(Level.SEVERE, "Internal deserialization error", e);
+            getLogger().log(Level.SEVERE, "Internal deserialization error", e);
         }
     };
 
+    @Override
     public String getName() {
         return name;
     }
 
+    @Override
     public Class<?> getPropertyType() {
         return propertyType;
     }
 
+    @Override
     public Property<?> createProperty(Object bean) {
         return new MethodProperty<Object>(propertyType, bean, readMethod,
                 writeMethod);
     }
 
-}
+    private static final Logger getLogger() {
+        return Logger.getLogger(MethodPropertyDescriptor.class.getName());
+    }
+}
\ No newline at end of file