svn commit: r1467760 - in /camel/trunk/camel-core/src: main/java/org/apache/camel/util/StringQuoteHelper.java test/java/org/apache/camel/util/StingQuoteHelperTest.java

[davsclaus]

Author: davsclaus
Date: Sun Apr 14 10:30:31 2013
New Revision: 1467760

URL: http://svn.apache.org/r1467760
Log:
CAMEL-6271: StringQuoteHelper - Fixed empty quotes being parsed and returned in 
answer

Modified:
    
camel/trunk/camel-core/src/main/java/org/apache/camel/util/StringQuoteHelper.java
    
camel/trunk/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java

Modified: 
camel/trunk/camel-core/src/main/java/org/apache/camel/util/StringQuoteHelper.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/util/StringQuoteHelper.java?rev=1467760&r1=1467759&r2=1467760&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/main/java/org/apache/camel/util/StringQuoteHelper.java
 (original)
+++ 
camel/trunk/camel-core/src/main/java/org/apache/camel/util/StringQuoteHelper.java
 Sun Apr 14 10:30:31 2013
@@ -75,11 +75,20 @@ public final class StringQuoteHelper {
 
         for (int i = 0; i < input.length(); i++) {
             char ch = input.charAt(i);
+            char prev = i > 0 ? input.charAt(i - 1) : 0;
 
             if (ch == '\'') {
+                if (singleQuoted && prev == ch && sb.length() == 0) {
+                    // its an empty quote so add empty text
+                    answer.add("");
+                }
                 singleQuoted = !singleQuoted;
                 continue;
             } else if (ch == '"') {
+                if (doubleQuoted && prev == ch && sb.length() == 0) {
+                    // its an empty quote so add empty text
+                    answer.add("");
+                }
                 doubleQuoted = !doubleQuoted;
                 continue;
             } else if (ch == ' ') {

Modified: 
camel/trunk/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java?rev=1467760&r1=1467759&r2=1467760&view=diff
==============================================================================
--- 
camel/trunk/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java
 (original)
+++ 
camel/trunk/camel-core/src/test/java/org/apache/camel/util/StingQuoteHelperTest.java
 Sun Apr 14 10:30:31 2013
@@ -92,6 +92,11 @@ public class StingQuoteHelperTest extend
         assertEquals(2, out.length);
         assertEquals("http:", out[0]);
         assertEquals(" ", out[1]);
+
+        out = StringQuoteHelper.splitSafeQuote("'http:', ''", ',', false);
+        assertEquals(2, out.length);
+        assertEquals("http:", out[0]);
+        assertEquals("", out[1]);
     }
 
 }