Repository: logging-log4j2 Updated Branches: refs/heads/master 73f36e501 -> 21da4aac4
Use Java 7 try-with-resources. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/21da4aac Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/21da4aac Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/21da4aac Branch: refs/heads/master Commit: 21da4aac4ff50fb97c1df2852565dfb93a86266a Parents: 73f36e5 Author: Gary Gregory <[email protected]> Authored: Sat Jun 13 15:17:40 2015 -0700 Committer: Gary Gregory <[email protected]> Committed: Sat Jun 13 15:17:40 2015 -0700 ---------------------------------------------------------------------- .../logging/log4j/core/impl/ThrowableFormatOptions.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/21da4aac/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java ---------------------------------------------------------------------- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java index 18fec89..d5e0285 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/impl/ThrowableFormatOptions.java @@ -193,11 +193,15 @@ public final class ThrowableFormatOptions { if (options.length == 1 && Strings.isNotEmpty(options[0])) { final String[] opts = options[0].split(Patterns.COMMA_SEPARATOR, 2); final String first = opts[0].trim(); - final Scanner scanner = new Scanner(first); - if (opts.length > 1 && (first.equalsIgnoreCase(FULL) || first.equalsIgnoreCase(SHORT) || first.equalsIgnoreCase(NONE) || scanner.hasNextInt())) { - options = new String[]{first, opts[1].trim()}; + try (final Scanner scanner = new Scanner(first)) { + if (opts.length > 1 + && (first.equalsIgnoreCase(FULL) || first.equalsIgnoreCase(SHORT) + || first.equalsIgnoreCase(NONE) || scanner.hasNextInt())) { + options = new String[] { + first, + opts[1].trim() }; + } } - scanner.close(); } int lines = DEFAULT.lines;
