commit e950257324cd564a4a5be7ea3947b98466a5e19f
author Tomasz Grabarczyk <grabarczyk.t@gmail.com> Fri Dec 23 14:58:04 2016 +0100
committer Tomasz Grabarczyk <grabarczyk.t@gmail.com> Fri Dec 23 14:58:04 2016 +0100
tree 29342a96ec8e3391da6116754a75cb3f5b40cee3
parent 0a6b6285c74586678f5e90abb4bb388d2869c365

Fixed NullPointerException in handling of Jetty arguments

Bug: #9472
Change-Id: Ib7d3d49f08b73a052b8c3a775d8f5e5121a997a1
Bug-Link: https://github.com/gwtproject/gwt/issues/9472

dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java

diff --git a/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java b/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
index f990610..fcfe5d3 100644
--- a/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
+++ b/dev/core/src/com/google/gwt/dev/shell/jetty/JettyLauncher.java
@@ -655,12 +655,13 @@
           keyStorePassword = value;
         } else if ("pwfile".equals(tag)) {
           useSsl = true;
-          keyStorePassword = Util.readFileAsString(new File(value)).trim();
+          keyStorePassword = Util.readFileAsString(new File(value));
           if (keyStorePassword == null) {
             logger.log(TreeLogger.ERROR,
                 "Unable to read keystore password from '" + value + "'");
             return false;
           }
+          keyStorePassword = keyStorePassword.trim();
         } else if ("clientAuth".equals(tag)) {
           useSsl = true;
           try {