From e68dcf1bfd7f32c59ebd23fa16ca53e1a53f8ddf Mon Sep 17 00:00:00 2001
From: mgiambalvo <heathkit@gmail.com>
Date: Thu, 19 Jan 2017 21:52:33 -0800
Subject: [PATCH] fix(driverProviders): Check config in the right place.
 (#3991)

---
 lib/driverProviders/local.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/driverProviders/local.ts b/lib/driverProviders/local.ts
index d60a2613a..afeb6a645 100644
--- a/lib/driverProviders/local.ts
+++ b/lib/driverProviders/local.ts
@@ -100,10 +100,6 @@ export class Local extends DriverProvider {
 
     let serverConf = this.config_.localSeleniumStandaloneOpts || {};
 
-    if (!Array.isArray(serverConf.jvmArgs)) {
-      throw new ConfigError(logger, 'jvmArgs should be an array.');
-    }
-
     // If args or port is not set use seleniumArgs and seleniumPort
     // for backward compatibility
     if (serverConf.args === undefined) {
@@ -111,6 +107,10 @@ export class Local extends DriverProvider {
     }
     if (serverConf.jvmArgs === undefined) {
       serverConf.jvmArgs = this.config_.jvmArgs || [];
+    } else {
+      if (!Array.isArray(serverConf.jvmArgs)) {
+        throw new ConfigError(logger, 'jvmArgs should be an array.');
+      }
     }
     if (serverConf.port === undefined) {
       serverConf.port = this.config_.seleniumPort;