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 2021/11/04 19:17:21 UTC
[commons-daemon] branch master updated: MInor Changes (#31)
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 743b6d9 MInor Changes (#31)
743b6d9 is described below
commit 743b6d9f875d2c6cb6126923a46353548c9915ec
Author: Arturo Bernal <ar...@gmail.com>
AuthorDate: Thu Nov 4 20:17:15 2021 +0100
MInor Changes (#31)
* * Replace Explicit with <>
* Simplify expressions
* Use java array style
* Revert changes <>. Incompatible with java 1.6
---
.../daemon/support/DaemonConfiguration.java | 2 +-
.../commons/daemon/support/DaemonLoader.java | 24 +++++++++-------------
.../commons/daemon/support/DaemonWrapper.java | 4 ++--
.../org/apache/commons/daemon/SimpleDaemon.java | 2 +-
4 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java b/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java
index 628c361..41bea33 100644
--- a/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java
+++ b/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java
@@ -192,7 +192,7 @@ public final class DaemonConfiguration
public String[] getPropertyArray(final String name)
throws ParseException
{
- final ArrayList<String> list = new ArrayList<>();
+ final ArrayList<String> list = new ArrayList<String>();
String args;
// Load daemon.arg[0] ... daemon.arg[n] into the String array.
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 4cbf146..07ab19f 100644
--- a/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
+++ b/src/main/java/org/apache/commons/daemon/support/DaemonLoader.java
@@ -112,7 +112,7 @@ public final class DaemonLoader
return false;
}
- public static boolean load(final String className, String args[])
+ public static boolean load(final String className, String[] args)
{
try {
/* Check if the underlying library supplied a valid list of
@@ -173,13 +173,12 @@ public final class DaemonLoader
init = c.getMethod("init", myclass);
- myclass = null;
- start = c.getMethod("start", myclass);
- stop = c.getMethod("stop", myclass);
- destroy = c.getMethod("destroy", myclass);
+ start = c.getMethod("start", null);
+ stop = c.getMethod("stop", null);
+ destroy = c.getMethod("destroy", null);
try {
- signal = c.getMethod("signal", myclass);
+ signal = c.getMethod("signal", null);
} catch (final NoSuchMethodException e) {
// Signalling will be disabled.
}
@@ -200,12 +199,12 @@ public final class DaemonLoader
context.setController(controller);
/* Now we want to call the init method in the class */
- final Object arg[] = new Object[1];
+ final Object[] arg = new Object[1];
arg[0] = context;
init.invoke(daemon, arg);
}
else {
- final Object arg[] = new Object[1];
+ final Object[] arg = new Object[1];
arg[0] = args;
init.invoke(daemon, arg);
}
@@ -237,8 +236,7 @@ public final class DaemonLoader
{
try {
/* Attempt to start the daemon */
- final Object arg[] = null;
- start.invoke(daemon, arg);
+ start.invoke(daemon, null);
/* Set the availability flag in the controller */
if (controller != null) {
@@ -264,8 +262,7 @@ public final class DaemonLoader
}
/* Attempt to stop the daemon */
- final Object arg[] = null;
- stop.invoke(daemon, arg);
+ stop.invoke(daemon, null);
}
catch (final Throwable t) {
/* In case we encounter ANY error, we dump the stack trace and
@@ -281,8 +278,7 @@ public final class DaemonLoader
{
try {
/* Attempt to stop the daemon */
- final Object arg[] = null;
- destroy.invoke(daemon, arg);
+ destroy.invoke(daemon, null);
daemon = null;
controller = null;
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 83c2286..036bcef 100644
--- a/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
+++ b/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
@@ -216,7 +216,7 @@ public class DaemonWrapper implements Daemon
protected void addArguments(final String[] args)
{
if (args != null) {
- final ArrayList<String> aa = new ArrayList<>();
+ final ArrayList<String> aa = new ArrayList<String>();
if (this.args != null) {
aa.addAll(Arrays.asList(this.args));
}
@@ -240,7 +240,7 @@ public class DaemonWrapper implements Daemon
// We only need object instance for non-static methods.
obj = main.getConstructor().newInstance();
}
- final Object arg[] = new Object[1];
+ final Object[] arg = new Object[1];
arg[0] = args;
inst.invoke(obj, arg);
diff --git a/src/test/java/org/apache/commons/daemon/SimpleDaemon.java b/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
index af059d1..4bd37bf 100644
--- a/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
+++ b/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
@@ -39,7 +39,7 @@ public class SimpleDaemon implements Daemon, Runnable, DaemonUserSignal {
public SimpleDaemon() {
System.err.println("SimpleDaemon: instance "+this.hashCode()+
" created");
- this.handlers =new Vector<>();
+ this.handlers = new Vector<Handler>();
}
@Override