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 2020/11/17 17:21:12 UTC

[commons-daemon] branch master updated: Revert "Use Java 7 diamonds."

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 147edd1  Revert "Use Java 7 diamonds."
147edd1 is described below

commit 147edd1bba8599cb760e099ac3d456a3edbace21
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Nov 17 12:18:55 2020 -0500

    Revert "Use Java 7 diamonds."
    
    This reverts commit a478cef1ba2c4a8123e62929ee4a3d906f5f909e.
---
 .../java/org/apache/commons/daemon/support/DaemonConfiguration.java     | 2 +-
 src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java      | 2 +-
 src/test/java/org/apache/commons/daemon/SimpleDaemon.java               | 2 +-
 3 files changed, 3 insertions(+), 3 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 85598d8..8178ca9 100644
--- a/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java
+++ b/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java
@@ -193,7 +193,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/DaemonWrapper.java b/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
index d3647d8..314f949 100644
--- a/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
+++ b/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
@@ -217,7 +217,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));
                 }
diff --git a/src/test/java/org/apache/commons/daemon/SimpleDaemon.java b/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
index 259fa5e..cbca3ac 100644
--- a/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
+++ b/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
@@ -40,7 +40,7 @@ public class SimpleDaemon implements Daemon, Runnable, DaemonUserSignal {
         super();
         System.err.println("SimpleDaemon: instance "+this.hashCode()+
                            " created");
-        this.handlers=new Vector<>();
+        this.handlers=new Vector<Handler>();
     }
 
     @Override