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 95c6512 No need to nest in else.
95c6512 is described below
commit 95c6512de7b7848d9a914b1a0327860e162949dc
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Mar 5 14:07:52 2021 -0500
No need to nest in else.
---
.../apache/commons/daemon/DaemonPermission.java | 2 +-
.../daemon/support/DaemonConfiguration.java | 30 ++++++++++------------
.../commons/daemon/support/DaemonWrapper.java | 2 +-
3 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/apache/commons/daemon/DaemonPermission.java
b/src/main/java/org/apache/commons/daemon/DaemonPermission.java
index 2ecd994..bc5a3b7 100644
--- a/src/main/java/org/apache/commons/daemon/DaemonPermission.java
+++ b/src/main/java/org/apache/commons/daemon/DaemonPermission.java
@@ -372,7 +372,7 @@ public final class DaemonPermission extends Permission
return MASK_CONTROL_START | MASK_CONTROL_STOP |
MASK_CONTROL_SHUTDOWN | MASK_CONTROL_RELOAD;
}
- else if (CONTROL_START.equalsIgnoreCase(val)) {
+ if (CONTROL_START.equalsIgnoreCase(val)) {
mask = mask | MASK_CONTROL_START;
}
else if (CONTROL_STOP.equalsIgnoreCase(val)) {
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 0eeb59f..ea21b02 100644
--- a/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java
+++ b/src/main/java/org/apache/commons/daemon/support/DaemonConfiguration.java
@@ -129,26 +129,24 @@ public final class DaemonConfiguration
continue;
}
final int etoken = propValue.indexOf(ETOKEN, btoken);
- if (etoken != -1) {
- final String variable = propValue.substring(btoken +
BTOKEN.length(), etoken);
- String sysvalue = systemProperties.getProperty(variable);
- if (sysvalue == null) {
- // Try with the environment if there was no
- // property by that name.
- sysvalue = System.getenv(variable); // N.B. Deprecated in
Java 1.3/1.4, but re-instated in Java 1.5+
- }
- if (sysvalue != null) {
- final String strtoken = propValue.substring(ctoken,
btoken);
- expanded.append(strtoken);
- expanded.append(sysvalue);
- ctoken = etoken + ETOKEN.length();
- }
- }
- else {
+ if (etoken == -1) {
// We have "${" without "}"
throw new ParseException("Error while looking for teminating
'" +
ETOKEN + "'", btoken);
}
+ final String variable = propValue.substring(btoken +
BTOKEN.length(), etoken);
+ String sysvalue = systemProperties.getProperty(variable);
+ if (sysvalue == null) {
+ // Try with the environment if there was no
+ // property by that name.
+ sysvalue = System.getenv(variable); // N.B. Deprecated in Java
1.3/1.4, but re-instated in Java 1.5+
+ }
+ if (sysvalue != null) {
+ final String strtoken = propValue.substring(ctoken, btoken);
+ expanded.append(strtoken);
+ expanded.append(sysvalue);
+ ctoken = etoken + ETOKEN.length();
+ }
btoken = propValue.indexOf(BTOKEN, etoken + ETOKEN.length());
}
// Add what's left.
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 be128b7..c9a9fa0 100644
--- a/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
+++ b/src/main/java/org/apache/commons/daemon/support/DaemonWrapper.java
@@ -96,7 +96,7 @@ public class DaemonWrapper implements Daemon
// Done with argument processing
break;
}
- else if (args[i].equals("-daemon-properties")) {
+ if (args[i].equals("-daemon-properties")) {
if (++i == args.length) {
throw new IllegalArgumentException(args[i - 1]);
}
