svn commit: r1553862 - /commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ExecuteWatchdog.java

[gg...@apache.org]

Author: ggregory
Date: Sat Dec 28 16:09:26 2013
New Revision: 1553862

URL: http://svn.apache.org/r1553862
Log:
The parameter process is hiding a field from type ExecuteWatchdog.

Modified:
    commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ExecuteWatchdog.java

Modified: commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ExecuteWatchdog.java
URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ExecuteWatchdog.java?rev=1553862&r1=1553861&r2=1553862&view=diff
==============================================================================
--- commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ExecuteWatchdog.java (original)
+++ commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/ExecuteWatchdog.java Sat Dec 28 16:09:26 2013
@@ -96,13 +96,13 @@ public class ExecuteWatchdog implements 
      * Watches the given process and terminates it, if it runs for too long. All
      * information from the previous run are reset.
      * 
-     * @param process
+     * @param processToMonitor
      *            the process to monitor. It cannot be <tt>null</tt>
      * @throws IllegalStateException
      *             if a process is still being monitored.
      */
-    public synchronized void start(final Process process) {
-        if (process == null) {
+    public synchronized void start(final Process processToMonitor) {
+        if (processToMonitor == null) {
             throw new NullPointerException("process is null.");
         }
         if (this.process != null) {
@@ -111,7 +111,7 @@ public class ExecuteWatchdog implements 
         this.caught = null;
         this.killedProcess = false;
         this.watch = true;
-        this.process = process;
+        this.process = processToMonitor;
         this.processStarted = true;
         this.notifyAll();
         if (this.hasWatchdog) {