Move runShell call within null check. Use PropertiesConfiguration as type parameter.

Signed-off-by: Ville Ranta-aho <ville@ville-pekka.com>

Author: VillePekka

command/src/com/mirth/connect/cli/CommandLineInterface.java

@@ -153,8 +153,8 @@ private void run(String[] args) {
                 // Read data from this file
                 File propertiesFile = new File(line.getOptionValue("c", "conf" + File.separator + "mirth-cli-config.properties"));
 
-                FileBasedConfigurationBuilder<FileBasedConfiguration> builder =
-                    new FileBasedConfigurationBuilder<FileBasedConfiguration>(PropertiesConfiguration.class)
+                FileBasedConfigurationBuilder<PropertiesConfiguration> builder =
+                    new FileBasedConfigurationBuilder<PropertiesConfiguration>(PropertiesConfiguration.class)
                     .configure(params.fileBased()
                         .setFile(propertiesFile));
                     Configuration config = null;
@@ -178,13 +178,15 @@ private void run(String[] args) {
                     String user = line.getOptionValue("u", config.getString("user"));
                     String password = line.getOptionValue("p", config.getString("password"));
                     String script = line.getOptionValue("s", config.getString("script"));
-                }
-                if ((server != null) && (user != null) && (password != null)) {
-                    runShell(server, user, password, script, line.hasOption("d"));
-                } else {
-                    new HelpFormatter().printHelp("Shell", options);
-                    error("all of address, user, password, and version options must be supplied as arguments or in the default configuration file", null);
-                    System.exit(2);
+
+                    if ((server != null) && (user != null) && (password != null)) {
+                        runShell(server, user, password, script, line.hasOption("d"));
+                    } else {
+                        new HelpFormatter().printHelp("Shell", options);
+                        error("all of address, user, password, and version options must be supplied as arguments or in the default configuration file", null);
+                        System.exit(2);
+                    }
+
                 }
             } catch (ParseException e) {
                 error("Could not parse input arguments.", e);