You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/08/31 00:19:42 UTC
[15/50] [abbrv] git commit: Simplify null check. The string is never
nul.
Simplify null check. The string is never nul.
git-svn-id: https://svn.apache.org/repos/asf/logging/log4j/log4j2/trunk@1621034 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1d603faf
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1d603faf
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1d603faf
Branch: refs/heads/messaging-module
Commit: 1d603faf99061c7211066665c75497193a83183c
Parents: ff617d1
Author: mattsicker <ma...@unknown>
Authored: Thu Aug 28 04:28:25 2014 +0000
Committer: mattsicker <ma...@unknown>
Committed: Thu Aug 28 04:28:25 2014 +0000
----------------------------------------------------------------------
.../apache/logging/log4j/core/util/OptionConverter.java | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1d603faf/log4j-core/src/main/java/org/apache/logging/log4j/core/util/OptionConverter.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/OptionConverter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/OptionConverter.java
index 84a97d2..0a4b6ff 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/OptionConverter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/OptionConverter.java
@@ -178,13 +178,11 @@ public final class OptionConverter {
multiplier = ONE_K * ONE_K * ONE_K;
str = str.substring(0, index);
}
- if (str != null) {
- try {
- return Long.parseLong(str) * multiplier;
- } catch (final NumberFormatException e) {
- LOGGER.error("[{}] is not in proper int form.", str);
- LOGGER.error("[{}] not in expected format.", value, e);
- }
+ try {
+ return Long.parseLong(str) * multiplier;
+ } catch (final NumberFormatException e) {
+ LOGGER.error("[{}] is not in proper int form.", str);
+ LOGGER.error("[{}] not in expected format.", value, e);
}
return defaultValue;
}