commit ef7d1249a14bbc0e13b8ed0e4e704d730f6abf66
author Bruno P. Kinoshita <kinow@users.noreply.github.com> Wed Apr 28 23:32:52 2021 +1200
committer Bruno P. Kinoshita <kinow@users.noreply.github.com> Wed Apr 28 23:32:52 2021 +1200
tree 3f074ff9dab52c8d97b0e67169c74dce20227c64
parent 9e2a25527518325fdf75642ddc9a8c40989fd228
parent 931894ba894915d2ed0c93ef1333db98e97446fb

Merge branch 'pr-225'

This closes #225

src/changes/changes.xml

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 1a19640..4c78e19 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -83,6 +83,7 @@
     <action issue="TEXT-197" type="update" dev="kinow" due-to="Arturo Bernal">Replace statement lambda with expression lambda.</action>
     <action issue="TEXT-204" type="update" dev="kinow" due-to="Arturo Bernal">Use static class inner class in tests.</action>
     <action issue="TEXT-201" type="update" dev="kinow" due-to="Arturo Bernal">Simplify assertion.</action>
+    <action issue="TEXT-202" type="update" dev="kinow" due-to="Arturo Bernal">Extract duplicate code.</action>
   </release>
   <release version="1.9" date="2020-07-21" description="Release 1.9. Requires Java 8.">
     <action issue="TEXT-166" type="fix" dev="kinow" due-to="Mikko Maunu">Removed non-existing parameter from Javadocs and spelled out parameters in throws.</action>

src/main/java/org/apache/commons/text/StrTokenizer.java

diff --git a/src/main/java/org/apache/commons/text/StrTokenizer.java b/src/main/java/org/apache/commons/text/StrTokenizer.java
index f1e1b74..3f84920 100644
--- a/src/main/java/org/apache/commons/text/StrTokenizer.java
+++ b/src/main/java/org/apache/commons/text/StrTokenizer.java
@@ -803,10 +803,6 @@
                     continue;
                 }
 
-                // copy regular character from inside quotes
-                workArea.append(srcChars[pos++]);
-                trimStart = workArea.size();
-
             } else {
                 // Not in quoting mode
 
@@ -842,10 +838,10 @@
                     continue;
                 }
 
-                // copy regular character from outside quotes
-                workArea.append(srcChars[pos++]);
-                trimStart = workArea.size();
             }
+            // copy regular character from inside quotes
+            workArea.append(srcChars[pos++]);
+            trimStart = workArea.size();
         }
 
         // return condition when end of string found

src/main/java/org/apache/commons/text/StringTokenizer.java

diff --git a/src/main/java/org/apache/commons/text/StringTokenizer.java b/src/main/java/org/apache/commons/text/StringTokenizer.java
index 9cd9922..14f1764 100644
--- a/src/main/java/org/apache/commons/text/StringTokenizer.java
+++ b/src/main/java/org/apache/commons/text/StringTokenizer.java
@@ -810,10 +810,6 @@
                     continue;
                 }
 
-                // copy regular character from inside quotes
-                workArea.append(srcChars[pos++]);
-                trimStart = workArea.size();
-
             } else {
                 // Not in quoting mode
 
@@ -848,11 +844,10 @@
                     pos += trimmedLen;
                     continue;
                 }
-
-                // copy regular character from outside quotes
-                workArea.append(srcChars[pos++]);
-                trimStart = workArea.size();
             }
+            // copy regular character from inside quotes
+            workArea.append(srcChars[pos++]);
+            trimStart = workArea.size();
         }
 
         // return condition when end of string found