From a740983a851be5c76cb4bf129ba329351db88a42 Mon Sep 17 00:00:00 2001 From: Tony Zeng Date: Thu, 28 Sep 2017 22:08:13 -0500 Subject: [PATCH] fix tonkenizer It uses the `ch == 0` to check whether this expression reaches end, makes me impossible to use `\0` in Spring EL. --- .../springframework/expression/spel/standard/Tokenizer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java b/spring-expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java index a4c8b8ab5b8a..35a0d55b0038 100644 --- a/spring-expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java +++ b/spring-expression/src/main/java/org/springframework/expression/spel/standard/Tokenizer.java @@ -293,7 +293,7 @@ private void lexQuotedStringLiteral() { terminated = true; } } - if (ch == 0) { + if (this.pos == this.max - 1) { throw new InternalParseException(new SpelParseException(this.expressionString, start, SpelMessage.NON_TERMINATING_QUOTED_STRING)); } @@ -318,7 +318,7 @@ private void lexDoubleQuotedStringLiteral() { terminated = true; } } - if (ch == 0) { + if (this.pos == this.max - 1) { throw new InternalParseException(new SpelParseException(this.expressionString, start, SpelMessage.NON_TERMINATING_DOUBLE_QUOTED_STRING)); }