From ffc4cbe5da08084398a434daf16ad10fbd769554 Mon Sep 17 00:00:00 2001
From: Alexandre Iline <shurailine@openjdk.org>
Date: Tue, 24 Jul 2018 08:58:32 -0700
Subject: [PATCH] 8208157: requires.VMProps throws NPE for missing properties
 in "release" file

Reviewed-by: iignatyev, lancea
---
 test/jtreg-ext/requires/VMProps.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java
index b9b14ebdeca..fe75a7b3e86 100644
--- a/test/jtreg-ext/requires/VMProps.java
+++ b/test/jtreg-ext/requires/VMProps.java
@@ -432,7 +432,8 @@ public class VMProps implements Callable<Map<String, String>> {
                 System.getProperty("java.home") + "/release"))) {
             Properties properties = new Properties();
             properties.load(in);
-            return properties.getProperty("IMPLEMENTOR").replace("\"", "");
+            String implementorProperty = properties.getProperty("IMPLEMENTOR");
+            return (implementorProperty == null) ? "null" : implementorProperty.replace("\"", "");
         } catch (IOException e) {
             e.printStackTrace();
         }