Merge pull request #338 from domaframework/reuse-char-buffer

Reuse CharBuffer instances

Author: nakamura-to

src/main/java/org/seasar/doma/internal/expr/ExpressionTokenizer.java

@@ -10,9 +10,9 @@ public class ExpressionTokenizer {
 
   protected final String expression;
 
-  protected CharBuffer buf;
+  protected final CharBuffer buf;
 
-  protected CharBuffer duplicatedBuf;
+  protected final CharBuffer duplicatedBuf;
 
   protected ExpressionTokenType type;
 
@@ -48,7 +48,7 @@ protected void prepareToken() {
     position = buf.position();
     duplicatedBuf.limit(position);
     token = duplicatedBuf.toString();
-    duplicatedBuf = buf.duplicate();
+    duplicatedBuf.position(position);
   }
 
   public String getToken() {
@@ -62,8 +62,9 @@ public int getPosition() {
   public void setPosition(int position, boolean binaryOpAvailable) {
     this.position = position;
     this.binaryOpAvailable = binaryOpAvailable;
+    duplicatedBuf.limit(position);
     duplicatedBuf.position(position);
-    buf = duplicatedBuf.duplicate();
+    buf.position(position);
     peek();
   }
 

src/main/java/org/seasar/doma/internal/jdbc/sql/SqlTokenizer.java

@@ -51,7 +51,7 @@ public class SqlTokenizer {
 
   protected final CharBuffer buf;
 
-  protected CharBuffer duplicatedBuf;
+  protected final CharBuffer duplicatedBuf;
 
   protected SqlTokenType type;
 
@@ -96,7 +96,7 @@ protected void prepareToken() {
     position = buf.position() - lineStartPosition;
     duplicatedBuf.limit(buf.position());
     token = duplicatedBuf.toString();
-    duplicatedBuf = buf.duplicate();
+    duplicatedBuf.position(buf.position());
   }
 
   public String getToken() {