Print

Print


Commit in lcio/src/java/hep/lcio/util on MAIN
MergeCommandHandler.java+3-31.8 -> 1.9
JM: Bug fix.

lcio/src/java/hep/lcio/util
MergeCommandHandler.java 1.8 -> 1.9
diff -u -r1.8 -r1.9
--- MergeCommandHandler.java	7 Dec 2006 00:47:32 -0000	1.8
+++ MergeCommandHandler.java	31 Jan 2007 19:27:44 -0000	1.9
@@ -20,7 +20,7 @@
  * passes the results to a method from MergeUtil.
  *
  * @author jeremym
- * @version $Id: MergeCommandHandler.java,v 1.8 2006/12/07 00:47:32 jeremy Exp $
+ * @version $Id: MergeCommandHandler.java,v 1.9 2007/01/31 19:27:44 jeremy Exp $
  */
 public class MergeCommandHandler extends CommandHandler
 {
@@ -117,14 +117,14 @@
 		// Read a file containing comma-delimited list of fname and nreads.
 		if (cl.hasOption("i"))
 		{
-			mergeFiles = createMergeFiles(FileUtil.loadFile(cl.getOptionValue("f")));
+			mergeFiles = createMergeFiles(FileUtil.loadFile(cl.getOptionValue("i")));
 		}
 
 		// Add input files one-by-one.
 		if (cl.hasOption("f"))
 		{
 			// Create input file array.
-			infiles = FileUtil.createFiles(cl.getOptionValues("i"));
+			infiles = FileUtil.createFiles(cl.getOptionValues("f"));
 
 			// Create default merge files.
 			mergeFiles = createDefaultMergeFiles(infiles);
CVSspam 0.2.8