--- a/src/java.base/share/classes/java/lang/VersionProps.java.template	Thu Dec 13 16:14:07 2018 +0100
+++ b/src/java.base/share/classes/java/lang/VersionProps.java.template	Thu Dec 13 15:31:05 2018 +0100
@@ -73,7 +73,7 @@
         "@@VENDOR_VERSION_STRING@@";
 
     private static final String vendor_version =
-        (VENDOR_VERSION_STRING.length() > 0
+        (!VENDOR_VERSION_STRING.isEmpty()
          ? " " + VENDOR_VERSION_STRING : "");
 
     private static final String VENDOR =
@@ -95,7 +95,7 @@
         props.put("java.version.date", java_version_date);
         props.put("java.runtime.version", java_runtime_version);
         props.put("java.runtime.name", java_runtime_name);
-        if (VENDOR_VERSION_STRING.length() > 0)
+        if (!VENDOR_VERSION_STRING.isEmpty())
             props.put("java.vendor.version", VENDOR_VERSION_STRING);
 
         props.put("java.class.version", CLASSFILE_MAJOR_MINOR);