From 9f2c1183b8c223d3a945572c5e300882847d6d34 Mon Sep 17 00:00:00 2001
From: Doug Simmons <doug@mach6.net>
Date: Wed, 16 Nov 2016 20:02:10 -0800
Subject: [PATCH] Guard against NPE in RegistrationRequest#build()

---
 .../grid/common/RegistrationRequest.java      | 21 ++++++++++---------
 .../grid/common/RegistrationRequestTest.java  | 13 ++++++++++++
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/java/server/src/org/openqa/grid/common/RegistrationRequest.java b/java/server/src/org/openqa/grid/common/RegistrationRequest.java
index ecc05dba0f84d..dea24cab5666e 100644
--- a/java/server/src/org/openqa/grid/common/RegistrationRequest.java
+++ b/java/server/src/org/openqa/grid/common/RegistrationRequest.java
@@ -200,21 +200,22 @@ public static RegistrationRequest build(GridNodeConfiguration configuration, Str
    * @return
    */
   public static RegistrationRequest build(GridNodeConfiguration configuration, String name, String description) {
-    RegistrationRequest pendingRequest = (configuration == null) ?
-      new RegistrationRequest(new GridNodeConfiguration(), name, description) :
-      new RegistrationRequest(configuration, name, description);
+    GridNodeConfiguration pendingConfiguration = (configuration == null) ?
+                                                 new GridNodeConfiguration() : configuration;
 
-    if (configuration.nodeConfigFile != null) {
-      pendingRequest.configuration = GridNodeConfiguration.loadFromJSON(configuration.nodeConfigFile);
+    RegistrationRequest pendingRequest = new RegistrationRequest(pendingConfiguration, name, description);
+
+    if (pendingConfiguration.nodeConfigFile != null) {
+      pendingRequest.configuration = GridNodeConfiguration.loadFromJSON(pendingConfiguration.nodeConfigFile);
     }
 
-    pendingRequest.configuration.merge(configuration);
+    pendingRequest.configuration.merge(pendingConfiguration);
     //update important merge protected values for the pendingRequest we are building.
-    if (configuration.host != null) {
-      pendingRequest.configuration.host = configuration.host;
+    if (pendingConfiguration.host != null) {
+      pendingRequest.configuration.host = pendingConfiguration.host;
     }
-    if (configuration.port != null) {
-      pendingRequest.configuration.port = configuration.port;
+    if (pendingConfiguration.port != null) {
+      pendingRequest.configuration.port = pendingConfiguration.port;
     }
 
     // make sure we have a valid host
diff --git a/java/server/test/org/openqa/grid/common/RegistrationRequestTest.java b/java/server/test/org/openqa/grid/common/RegistrationRequestTest.java
index fd930766e7d2e..c6799a6d70ee5 100644
--- a/java/server/test/org/openqa/grid/common/RegistrationRequestTest.java
+++ b/java/server/test/org/openqa/grid/common/RegistrationRequestTest.java
@@ -19,6 +19,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import com.beust.jcommander.JCommander;
@@ -178,4 +179,16 @@ public void testBuildWithConfiguration() {
 
     assertEquals(expectedConfig.toString(), req.getConfiguration().toString());
   }
+
+  /**
+   * Tests that RegistrationRequest.build() performs as expected
+   */
+  @Test
+  public void testBuild() {
+    RegistrationRequest req = RegistrationRequest.build();
+    assertNotNull(req);
+    assertNotNull(req.getConfiguration());
+    assertNull(req.getName());
+    assertNull(req.getDescription());
+  }
 }