1 files changed, 6 insertions, 3 deletions
diff --git a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java
index 0235fb277d..cc92551846 100644
--- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java
+++ b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/SerializerGenerator.java
@@ -473,9 +473,12 @@ public class SerializerGenerator extends Generator {
         if (typePackage == null) {
             return SerializerMap.class.getPackage().getName();
         } else {
-            // What about e.g. java.* packages, can we create classes there or
-            // should we use e.g. com.vaadin.java.*
-            return typePackage.getName();
+            String packageName = typePackage.getName();
+            // Dev mode classloader gets unhappy for some java packages
+            if (packageName.startsWith("java.")) {
+                packageName = "com.vaadin." + packageName;
+            }
+            return packageName;
         }
     }
 }