Added to the Javadoc

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@542476 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 11 insertions, 27 deletions

diff --git a/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java b/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
index ffc8f1643a..7f6b1d40ac 100644
--- a/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
+++ b/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
@@ -22,13 +22,10 @@ package org.apache.qpid.pool;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-
 import org.apache.log4j.Logger;
-
 import org.apache.mina.common.IdleStatus;
 import org.apache.mina.common.IoFilterAdapter;
 import org.apache.mina.common.IoSession;
-
 import org.apache.qpid.pool.Event.CloseEvent;
 
 /**
@@ -201,19 +198,6 @@ public abstract class PoolingFilter extends IoFilterAdapter implements Job.JobCo
         return (Job) session.getAttribute(_name);
     }
 
-    /*private Job createJobForSession(IoSession session)
-    {
-        return addJobForSession(session, new Job(session, this, _maxEvents));
-    }*/
-
-    /*private Job addJobForSession(IoSession session, Job job)
-    {
-        // atomic so ensures all threads agree on the same job
-        Job existing = _jobs.putIfAbsent(session, job);
-
-        return (existing == null) ? job : existing;
-    }*/
-
     /**
      * Implements a terminal continuation for the {@link Job} for this filter. Whenever the Job completes its processing
      * of a batch of events this is called. This method simply re-activates the job, if it has more events to process.
@@ -223,15 +207,6 @@ public abstract class PoolingFilter extends IoFilterAdapter implements Job.JobCo
      */
     public void completed(IoSession session, Job job)
     {
-        // if (job.isComplete())
-        // {
-        // job.release();
-        // if (!job.isReferenced())
-        // {
-        // _jobs.remove(session);
-        // }
-        // }
-        // else
         if (!job.isComplete())
         {
             // ritchiem : 2006-12-13 Do we need to perform the additional checks here?
diff --git a/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java b/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
index 61955160be..9bb4a6635f 100644
--- a/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
+++ b/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
@@ -603,12 +603,21 @@ public class CommandLineParser
     }

 

     /**

-     * Extracts all name=value pairs from the command line, sets them all as system properties and also returns

-     * a map of properties containing them.

+     * Parses the command line arguments against the specified command line format, printing errors and usage

+     * instrucitons and calling System.exit on errors. Extracts all trailing name=value pairs from the command line,

+     * and sets them all as system properties and also returns a map of properties containing them.

      *

      * @param args The command line.

      *

      * @return A set of properties containing all name=value pairs from the command line.

+     *

+     * @todo Replace the call to System.exit with throwing an exception. Gives caller the option to decide how to

+     *       handle the error.

+     *

+     * @todo Pass in the location to write the usage to as an argument, instead of hard-coding System.out.

+     *

+     * @todo Allow the Properties to add trailing options to be specified as an argument rather than hard coding

+     *       system properties. Again, gives the caller the option to decide.

      */

     public static Properties processCommandLine(String[] args, CommandLineParser commandLine)

     {