Simplify conditional expression. (#531)
diff --git a/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java b/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
index a17697a..c8a949f 100644
--- a/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
+++ b/log4j-1.2-api/src/main/java/org/apache/log4j/Category.java
@@ -404,7 +404,7 @@
}
public boolean getAdditivity() {
- return isCoreAvailable ? CategoryUtil.isAdditive(logger) : false;
+ return isCoreAvailable && CategoryUtil.isAdditive(logger);
}
public void setAdditivity(final boolean additivity) {
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
index 204a9b5..7bcbc15 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/rolling/RollingFileManager.java
@@ -652,7 +652,7 @@
try {
FileUtils.makeParentDirs(file);
- final boolean created = data.createOnDemand ? false : file.createNewFile();
+ final boolean created = !data.createOnDemand && file.createNewFile();
LOGGER.trace("New file '{}' created = {}", name, created);
} catch (final IOException ioe) {
LOGGER.error("Unable to create file " + name, ioe);
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
index b815ee4..254d967 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/filter/BurstFilter.java
@@ -272,11 +272,7 @@
final LogDelay logDelay = (LogDelay) o;
- if (expireTime != logDelay.expireTime) {
- return false;
- }
-
- return true;
+ return expireTime == logDelay.expireTime;
}
@Override
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java
index 06aa387..bce2107 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/tools/picocli/CommandLine.java
@@ -2253,7 +2253,7 @@
args.push(value); // we don't consume the value
}
final Boolean currentValue = (Boolean) field.get(command);
- value = String.valueOf(currentValue == null ? true : !currentValue); // #147 toggle existing boolean value
+ value = String.valueOf(currentValue == null || !currentValue); // #147 toggle existing boolean value
}
}
if (noMoreValues && value == null) {
@@ -2967,10 +2967,10 @@
}
cls = cls.getSuperclass();
}
- sortOptions = (sortOptions == null) ? true : sortOptions;
- abbreviateSynopsis = (abbreviateSynopsis == null) ? false : abbreviateSynopsis;
+ sortOptions = sortOptions == null || sortOptions;
+ abbreviateSynopsis = abbreviateSynopsis != null && abbreviateSynopsis;
requiredOptionMarker = (requiredOptionMarker == null) ? ' ' : requiredOptionMarker;
- showDefaultValues = (showDefaultValues == null) ? false : showDefaultValues;
+ showDefaultValues = showDefaultValues != null && showDefaultValues;
synopsisHeading = (synopsisHeading == null) ? "Usage: " : synopsisHeading;
commandListHeading = (commandListHeading == null) ? "Commands:%n" : commandListHeading;
separator = (separator == null) ? DEFAULT_SEPARATOR : separator;
diff --git a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java
index f0c5b6c..c8976f2 100644
--- a/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java
+++ b/log4j-slf4j-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java
@@ -63,7 +63,7 @@
@Override
public boolean contains(final String s) {
- return s != null ? this.marker.isInstanceOf(s) : false;
+ return s != null && this.marker.isInstanceOf(s);
}
@Override
@@ -127,6 +127,6 @@
@Override
public boolean remove(final Marker marker) {
- return marker != null ? this.marker.remove(MarkerManager.getMarker(marker.getName())) : false;
+ return marker != null && this.marker.remove(MarkerManager.getMarker(marker.getName()));
}
}
diff --git a/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java b/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java
index 00351f9..3093185 100644
--- a/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java
+++ b/log4j-slf4j18-impl/src/main/java/org/apache/logging/slf4j/Log4jMarker.java
@@ -63,7 +63,7 @@
@Override
public boolean contains(final String s) {
- return s != null ? this.marker.isInstanceOf(s) : false;
+ return s != null && this.marker.isInstanceOf(s);
}
@Override
@@ -127,6 +127,6 @@
@Override
public boolean remove(final Marker marker) {
- return marker != null ? this.marker.remove(MarkerManager.getMarker(marker.getName())) : false;
+ return marker != null && this.marker.remove(MarkerManager.getMarker(marker.getName()));
}
}
