This is an automated email from the ASF dual-hosted git repository. sunlan pushed a commit to branch GROOVY_3_0_X in repository https://gitbox.apache.org/repos/asf/groovy.git
commit 864a4a2f9efaf77109cbbe293f575499ab9d5de5 Author: Daniel Sun <[email protected]> AuthorDate: Sat Apr 11 22:56:11 2020 +0800 Trivial refactoring: Replace with 'Math.max' call (cherry picked from commit d7852d61df49dad01dc678ba2e1f6b9a154335bf) --- .../src/main/java/org/apache/groovy/json/internal/CharBuf.java | 2 +- .../src/main/java/org/apache/groovy/json/internal/CharScanner.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java index 62fd285..57f3583 100644 --- a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java +++ b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharBuf.java @@ -401,7 +401,7 @@ public class CharBuf extends Writer implements CharSequence { int sizeNeeded = (ensureThisMuch) + _location; if (sizeNeeded > capacity) { - int growBy = (_buffer.length * 2) < sizeNeeded ? sizeNeeded : (_buffer.length * 2); + int growBy = Math.max((_buffer.length * 2), sizeNeeded); _buffer = Chr.grow(buffer, growBy); capacity = _buffer.length; } diff --git a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharScanner.java b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharScanner.java index ffd7a57..aa6ba10 100644 --- a/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharScanner.java +++ b/subprojects/groovy-json/src/main/java/org/apache/groovy/json/internal/CharScanner.java @@ -476,7 +476,7 @@ public class CharScanner { buf.addLine(new String(array, lastLineIndex, count)); } catch (Exception ex) { try { - int start = index = (index - 10 < 0) ? 0 : index - 10; + int start = index = Math.max(index - 10, 0); buf.addLine(new String(array, start, index)); } catch (Exception ex2) {
