Preventing NPE while creating a dir for the result file (RC). Fixes issue 6695

barancev · barancev · commit 5efdf4215273 · 2013-12-13T23:53:54.000+04:00
diff --git a/java/server/src/org/openqa/selenium/server/SeleniumServer.java b/java/server/src/org/openqa/selenium/server/SeleniumServer.java
@@ -625,7 +625,7 @@ protected void runHtmlSuite() {
       String resultFilePath = getRequiredSystemProperty("htmlSuite.resultFilePath");
       File resultFile = new File(resultFilePath);
       File resultDir = resultFile.getParentFile();
-      if (!resultDir.exists() && !resultDir.mkdirs()) {
+      if ((resultDir != null) && !resultDir.exists() && !resultDir.mkdirs()) {
         RemoteControlLauncher.usage("can't create directory for result file " + resultFilePath);
         System.exit(1);
       }

Original file line number	Diff line number	Diff line change
`@@ -625,7 +625,7 @@ protected void runHtmlSuite() {`
`625`	`625`	`String resultFilePath = getRequiredSystemProperty("htmlSuite.resultFilePath");`
`626`	`626`	`File resultFile = new File(resultFilePath);`
`627`	`627`	`File resultDir = resultFile.getParentFile();`
`628`		`- if (!resultDir.exists() && !resultDir.mkdirs()) {`
	`628`	`+ if ((resultDir != null) && !resultDir.exists() && !resultDir.mkdirs()) {`
`629`	`629`	`RemoteControlLauncher.usage("can't create directory for result file " + resultFilePath);`
`630`	`630`	`System.exit(1);`
`631`	`631`	`}`