You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/06/27 10:20:25 UTC
logging-log4j2 git commit: Useless assignments in returns (use
short-circuit).
Repository: logging-log4j2
Updated Branches:
refs/heads/master 17b5c8a04 -> b6e094e80
Useless assignments in returns (use short-circuit).
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b6e094e8
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b6e094e8
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b6e094e8
Branch: refs/heads/master
Commit: b6e094e803ed673a788fe948024cddabe755b6f6
Parents: 17b5c8a
Author: ggregory <gg...@apache.org>
Authored: Sat Jun 27 01:20:23 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Sat Jun 27 01:20:23 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java | 2 +-
.../logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java | 2 +-
.../logging/log4j/flume/appender/FlumePersistentAppenderTest.java | 2 +-
.../apache/logging/log4j/flume/appender/FlumePersistentPerf.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b6e094e8/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
index 860a6db..331de21 100644
--- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
+++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAgentTest.java
@@ -220,7 +220,7 @@ public class FlumeEmbeddedAgentTest {
return true;
}
- return result & file.delete();
+ return result && file.delete();
}
private static class EventCollector implements AvroSourceProtocol {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b6e094e8/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
index 4117836..7352ce3 100644
--- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
+++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumeEmbeddedAppenderTest.java
@@ -247,7 +247,7 @@ public class FlumeEmbeddedAppenderTest {
return true;
}
- return result & file.delete();
+ return result && file.delete();
}
private static class EventCollector implements AvroSourceProtocol {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b6e094e8/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
index 1dc7890..4e66856 100644
--- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
+++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentAppenderTest.java
@@ -385,7 +385,7 @@ public class FlumePersistentAppenderTest {
return true;
}
- return result & file.delete();
+ return result && file.delete();
}
private static class EventCollector implements AvroSourceProtocol {
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b6e094e8/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java
----------------------------------------------------------------------
diff --git a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java
index 2267bc8..8e7c4ec 100644
--- a/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java
+++ b/log4j-flume-ng/src/test/java/org/apache/logging/log4j/flume/appender/FlumePersistentPerf.java
@@ -162,7 +162,7 @@ public class FlumePersistentPerf {
return true;
}
- return result & file.delete();
+ return result && file.delete();
}
private static class EventCollector implements AvroSourceProtocol {