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 2015/12/11 06:18:10 UTC
logging-log4j2 git commit: Use Objects.requireNonNull
Repository: logging-log4j2
Updated Branches:
refs/heads/master eafdd0647 -> 1a861ab22
Use Objects.requireNonNull
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/1a861ab2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/1a861ab2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/1a861ab2
Branch: refs/heads/master
Commit: 1a861ab22982a695f4d9ebb5a79c83ea0b6e5439
Parents: eafdd06
Author: Matt Sicker <bo...@gmail.com>
Authored: Thu Dec 10 23:17:57 2015 -0600
Committer: Matt Sicker <bo...@gmail.com>
Committed: Thu Dec 10 23:17:57 2015 -0600
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/io/IoBuilder.java | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/1a861ab2/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/IoBuilder.java
----------------------------------------------------------------------
diff --git a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/IoBuilder.java b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/IoBuilder.java
index b8894f9..8e66dbd 100644
--- a/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/IoBuilder.java
+++ b/log4j-iostreams/src/main/java/org/apache/logging/log4j/io/IoBuilder.java
@@ -24,6 +24,7 @@ import java.io.Reader;
import java.io.UnsupportedEncodingException;
import java.io.Writer;
import java.nio.charset.Charset;
+import java.util.Objects;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
@@ -274,7 +275,7 @@ public class IoBuilder {
* @throws IllegalStateException if no Reader was configured for this builder
*/
public Reader buildReader() {
- final Reader in = requireNonNull(this.reader, "reader");
+ final Reader in = Objects.requireNonNull(this.reader, "reader");
if (this.buffered) {
if (this.bufferSize > 0) {
return new LoggerBufferedReader(in, this.bufferSize, this.logger, this.fqcn, this.level, this.marker);
@@ -319,7 +320,7 @@ public class IoBuilder {
* @throws IllegalStateException if no InputStream was configured for this builder
*/
public InputStream buildInputStream() {
- final InputStream in = requireNonNull(this.inputStream, "inputStream");
+ final InputStream in = Objects.requireNonNull(this.inputStream, "inputStream");
if (this.buffered) {
if (this.bufferSize > 0) {
return new LoggerBufferedInputStream(in, this.charset, this.bufferSize, this.logger, this.fqcn,
@@ -367,11 +368,4 @@ public class IoBuilder {
}
}
- private static <T> T requireNonNull(final T obj, final String name) {
- if (obj == null) {
- throw new IllegalStateException("The property " + name + " was not set");
- }
- return obj;
- }
-
}