Fix #1900

Author: jiafu1115

guava-tests/test/com/google/common/base/SplitterTest.java

@@ -733,6 +733,18 @@ public void testMapSplitter_CharacterSeparator() {
     assertThat(m.entrySet()).containsExactlyElementsIn(expected.entrySet()).inOrder();
   }
 
+  public void testMapSplitter_ValueContainKeyValueSeparator() {
+    Map<String, String> m = Splitter
+        .on(",")
+        .withKeyValueSeparator(':')
+        .split("boy:tom:tommy,girl:tina,cat:kitty,dog:tommy");
+    ImmutableMap<String, String> expected =
+        ImmutableMap.of("boy", "tom:tommy", "girl", "tina", "cat", "kitty", "dog", "tommy");
+
+    assertThat(m).isEqualTo(expected);
+    assertThat(m.entrySet()).containsExactlyElementsIn(expected.entrySet()).inOrder();
+  }
+
   public void testMapSplitter_multiCharacterSeparator() {
     // try different delimiters.
     Map<String, String> m = Splitter

guava/src/com/google/common/base/Splitter.java

@@ -481,7 +481,7 @@ private MapSplitter(Splitter outerSplitter, Splitter entrySplitter) {
     public Map<String, String> split(CharSequence sequence) {
       Map<String, String> map = new LinkedHashMap<String, String>();
       for (String entry : outerSplitter.split(sequence)) {
-        Iterator<String> entryFields = entrySplitter.splittingIterator(entry);
+        Iterator<String> entryFields = entrySplitter.limit(2).splittingIterator(entry);
 
         checkArgument(entryFields.hasNext(), INVALID_ENTRY_MESSAGE, entry);
         String key = entryFields.next();
@@ -490,8 +490,6 @@ public Map<String, String> split(CharSequence sequence) {
         checkArgument(entryFields.hasNext(), INVALID_ENTRY_MESSAGE, entry);
         String value = entryFields.next();
         map.put(key, value);
-
-        checkArgument(!entryFields.hasNext(), INVALID_ENTRY_MESSAGE, entry);
       }
       return Collections.unmodifiableMap(map);
     }