Merge remote-tracking branch 'origin/master' into grid-unbuffered-editor

Change-Id: Id630861d5089b0deabbccffe66d971252c44f46b

2 files changed, 19 insertions, 3 deletions

diff --git a/server/src/com/vaadin/data/RpcDataProviderExtension.java b/server/src/com/vaadin/data/RpcDataProviderExtension.java
index 71b597ff1d..55947c98d1 100644
--- a/server/src/com/vaadin/data/RpcDataProviderExtension.java
+++ b/server/src/com/vaadin/data/RpcDataProviderExtension.java
@@ -947,6 +947,14 @@ public class RpcDataProviderExtension extends AbstractExtension {
                     listener.removeListener();
                 }
 
+                // Wipe clean all details.
+                HashSet<Object> detailItemIds = new HashSet<Object>(
+                        detailComponentManager.visibleDetailsComponents
+                                .keySet());
+                for (Object itemId : detailItemIds) {
+                    detailComponentManager.destroyDetails(itemId);
+                }
+
                 listeners.clear();
                 activeRowHandler.activeRange = Range.withLength(0, 0);
 
@@ -1387,4 +1395,14 @@ public class RpcDataProviderExtension extends AbstractExtension {
     public DetailComponentManager getDetailComponentManager() {
         return detailComponentManager;
     }
+
+    @Override
+    public void detach() {
+        for (Object itemId : ImmutableSet
+                .copyOf(detailComponentManager.visibleDetails)) {
+            detailComponentManager.destroyDetails(itemId);
+        }
+
+        super.detach();
+    }
 }
diff --git a/server/src/com/vaadin/data/util/converter/StringToCollectionConverter.java b/server/src/com/vaadin/data/util/converter/StringToCollectionConverter.java
index 495bed74f8..b86fec5558 100644
--- a/server/src/com/vaadin/data/util/converter/StringToCollectionConverter.java
+++ b/server/src/com/vaadin/data/util/converter/StringToCollectionConverter.java
@@ -155,9 +155,7 @@ public class StringToCollectionConverter implements
             previous = index + delimiter.length();
             index = value.indexOf(delimiter, previous);
         }
-        if (result.size() > 0) {
-            collectToken(value.substring(previous), result, converter, locale);
-        }
+        collectToken(value.substring(previous), result, converter, locale);
         return result;
     }