Author: challngr
Date: Fri Feb  8 19:25:41 2013
New Revision: 1444196

URL: http://svn.apache.org/r1444196
Log:
UIMA-2645
Need to move check for bad log file to AFTER finding what that file is! (NPE).

Modified:
    
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java

Modified: 
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
URL: 
http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java?rev=1444196&r1=1444195&r2=1444196&view=diff
==============================================================================
--- 
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
 (original)
+++ 
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/DuccServiceSubmit.java
 Fri Feb  8 19:25:41 2013
@@ -442,14 +442,7 @@ public class DuccServiceSubmit extends D
                        if 
(DuccUiUtilities.duplicate_options(duccMessageProcessor, commandLine)) {
                                return DuccUiConstants.ERROR;
                        }
-                       
-                       /*
-                        * check for writable log directory
-                        */
-                       if 
(!has_writable_log_directory(serviceRequestProperties)) {
-                               return DuccUiConstants.ERROR;
-                       }
-                       
+                                               
                        /*
                         * marshal user
                         */
@@ -542,6 +535,13 @@ public class DuccServiceSubmit extends D
                                }
                        }
                }
+        /*
+         * make sure the logdir is actually legal.
+         */
+        if (!has_writable_log_directory(serviceRequestProperties)) {
+            return DuccUiConstants.ERROR;
+        }
+
 
                // tack on "services" or "processes" to complete logging 
directory
         String log_extension = "services";


Reply via email to