commit 01cabf583332c8d31b24c2940f4f6806b8cd1fa8
author Svante Schubert <svanteschubert@apache.org> Mon Sep 05 18:38:10 2016 +0000
committer Svante Schubert <svanteschubert@apache.org> Mon Sep 05 18:38:10 2016 +0000
tree 6af7b3df069da202a705a2dd5d211462fed3a535
parent 5e74922a27fa1e681f2a5105b71faaec4a67d093

#ODFTOOLKIT-438# ODFValidator: always honour input file on cmd line, by Vasily Melenchuk

Signed-off-by: Svante Schubert <svanteschubert@apache.org>

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

validator/src/main/java/org/odftoolkit/odfvalidator/Main.java

diff --git a/validator/src/main/java/org/odftoolkit/odfvalidator/Main.java b/validator/src/main/java/org/odftoolkit/odfvalidator/Main.java
index 73fad5c..7a6d5c2 100644
--- a/validator/src/main/java/org/odftoolkit/odfvalidator/Main.java
+++ b/validator/src/main/java/org/odftoolkit/odfvalidator/Main.java
@@ -226,8 +226,16 @@
                     System.out.println("error reading " + aConfigFile.getAbsolutePath() + ": " + e.getLocalizedMessage() );
                     return;
                 }
+
+                // Permit input file override from command line, even
+                // if config file is given
+                if( aFileNames.size() > 0 )
+                {
+                    // But just one for the while...
+                    aConfig.setProperty( Configuration.PATH, aFileNames.get(0) );
+                }
             }
-            
+
             if( aSchemaFileName != null )
             {
                 aConfig = new Configuration();