You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2022/05/24 20:53:42 UTC
[commons-daemon] branch master updated: Use Objects#requireNonNull()
This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git
The following commit(s) were added to refs/heads/master by this push:
new 0319f80 Use Objects#requireNonNull()
new 09cd5bd Merge branch 'master' of https://gitbox.apache.org/repos/asf/commons-daemon
0319f80 is described below
commit 0319f8076c76d84557c1099f7cc4f83fcf116b0e
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue May 24 16:53:17 2022 -0400
Use Objects#requireNonNull()
---
.../org/apache/commons/daemon/support/DaemonLoader.java | 16 ++++++----------
.../org/apache/commons/daemon/support/DaemonWrapper.java | 12 ++++++------
2 files changed, 12 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java b/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
index 538c5a6..90b3a6c 100644
--- a/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
+++ b/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
@@ -23,6 +23,7 @@ import org.apache.commons.daemon.DaemonInitException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.util.Objects;
/**
* Used by jsvc for Daemon management.
@@ -59,14 +60,11 @@ public final class DaemonLoader
System.getProperty("commons.daemon.process.parent") + ")");
}
- public static boolean check(final String cn)
+ public static boolean check(final String className)
{
try {
/* Check the class name */
- if (cn == null) {
- throw new NullPointerException("Null class name specified");
- }
-
+ Objects.requireNonNull(className, "className");
/* Get the ClassLoader loading this class */
final ClassLoader cl = DaemonLoader.class.getClassLoader();
if (cl == null) {
@@ -75,11 +73,11 @@ public final class DaemonLoader
}
/* Find the required class */
- final Class<?> c = cl.loadClass(cn);
+ final Class<?> c = cl.loadClass(className);
/* This should _never_ happen, but double-checking doesn't harm */
if (c == null) {
- throw new ClassNotFoundException(cn);
+ throw new ClassNotFoundException(className);
}
/* Create a new instance of the daemon */
@@ -122,9 +120,7 @@ public final class DaemonLoader
}
/* Check the class name */
- if (className == null) {
- throw new NullPointerException("Null class name specified");
- }
+ Objects.requireNonNull(className, "className");
/* Get the ClassLoader loading this class */
final ClassLoader cl = DaemonLoader.class.getClassLoader();
diff --git a/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java b/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
index 5dfd0d3..0e44862 100644
--- a/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
+++ b/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
@@ -21,6 +21,8 @@ import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Objects;
+
import org.apache.commons.daemon.Daemon;
import org.apache.commons.daemon.DaemonContext;
@@ -266,14 +268,12 @@ public class DaemonWrapper implements Daemon
}
// Get the ClassLoader loading this class
- final ClassLoader cl = DaemonWrapper.class.getClassLoader();
- if (cl == null) {
- throw new NullPointerException("Cannot retrieve ClassLoader instance");
- }
+ final ClassLoader classLoader = DaemonWrapper.class.getClassLoader();
+ Objects.requireNonNull(classLoader, "classLoader");
final Class<?>[] ca = new Class[1];
- ca[0] = args.getClass();
+ ca[0] = args.getClass();
// Find the required class
- main = cl.loadClass(name);
+ main = classLoader.loadClass(name);
if (main == null) {
throw new ClassNotFoundException(name);
}