commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r925051 - /commons/proper/daemon/trunk/src/java/org/apache/commons/daemon/support/DaemonLoader.java
Date Fri, 19 Mar 2010 00:24:49 GMT
Author: sebb
Date: Fri Mar 19 00:24:48 2010
New Revision: 925051

URL: http://svn.apache.org/viewvc?rev=925051&view=rev
Log:
DAEMON-134 The field DaemonLoader.Context.controller is hiding a field from type DaemonLoader

Modified:
    commons/proper/daemon/trunk/src/java/org/apache/commons/daemon/support/DaemonLoader.java

Modified: commons/proper/daemon/trunk/src/java/org/apache/commons/daemon/support/DaemonLoader.java
URL: http://svn.apache.org/viewvc/commons/proper/daemon/trunk/src/java/org/apache/commons/daemon/support/DaemonLoader.java?rev=925051&r1=925050&r2=925051&view=diff
==============================================================================
--- commons/proper/daemon/trunk/src/java/org/apache/commons/daemon/support/DaemonLoader.java
(original)
+++ commons/proper/daemon/trunk/src/java/org/apache/commons/daemon/support/DaemonLoader.java
Fri Mar 19 00:24:48 2010
@@ -350,17 +350,18 @@ public final class DaemonLoader
         implements DaemonContext
     {
 
-        DaemonController controller = null;
+        DaemonController daemonController = null;
+
         String[] args = null;
 
         public DaemonController getController()
         {
-            return controller;
+            return daemonController;
         }
 
         public void setController(DaemonController controller)
         {
-            this.controller = controller;
+            this.daemonController = controller;
         }
 
         public String[] getArguments()



Mime
View raw message