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 2025/07/20 21:37:13 UTC

(commons-daemon) branch master updated: Merge some string literals

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 ba92937  Merge some string literals
ba92937 is described below

commit ba9293719995565d7f55175d66b12619cd7aa8c7
Author: Gary D. Gregory <ga...@gmail.com>
AuthorDate: Sun Jul 20 17:37:07 2025 -0400

    Merge some string literals
---
 src/samples/SimpleApplication.java                        | 4 ++--
 src/test/java/org/apache/commons/daemon/SimpleDaemon.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/samples/SimpleApplication.java b/src/samples/SimpleApplication.java
index cad8a4a..20f107b 100644
--- a/src/samples/SimpleApplication.java
+++ b/src/samples/SimpleApplication.java
@@ -320,7 +320,7 @@ public class SimpleApplication implements Runnable {
 
                     // Create a directory (PR 30177 with 1.4.x and 1.5.0
                     case '5':
-                        String name1 = this.getDirectoryName() + "/a/b/c/d/e" + "/SimpleApplication." + this.getConnectionNumber() + ".tmp";
+                        String name1 = this.getDirectoryName() + "/a/b/c/d/e/SimpleApplication." + this.getConnectionNumber() + ".tmp";
                         try {
                             this.createDir(name1);
                             out.println("File '" + name1 + "' created");
@@ -343,7 +343,7 @@ public class SimpleApplication implements Runnable {
 
                     // If we get an IOException we return (disconnect)
                 } catch (IOException e) {
-                    System.err.println("SimpleApplication: IOException in " + "connection " + this.getConnectionNumber());
+                    System.err.println("SimpleApplication: IOException in connection " + this.getConnectionNumber());
                     return;
                 }
             }
diff --git a/src/test/java/org/apache/commons/daemon/SimpleDaemon.java b/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
index a815e94..8d3934a 100644
--- a/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
+++ b/src/test/java/org/apache/commons/daemon/SimpleDaemon.java
@@ -314,7 +314,7 @@ public class SimpleDaemon implements Daemon, Runnable, DaemonUserSignal {
 
                     /* If we get an IOException we return (disconnect) */
                 } catch (final IOException e) {
-                    System.err.println("SimpleDaemon: IOException in " + "connection " + getConnectionNumber());
+                    System.err.println("SimpleDaemon: IOException in connection " + getConnectionNumber());
                     return;
                 }
             }