From 13dfec091f90c7f3e5dd11a215f06f528b66dd67 Mon Sep 17 00:00:00 2001 From: nsingh Date: Sun, 22 Oct 2017 21:22:22 -0700 Subject: [PATCH] Fixed NPE in isSpringBootAppSysprops check --- .../ide/vscode/commons/boot/app/cli/SpringBootApp.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java index 73baaeb7d..68eb6ef3f 100644 --- a/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java +++ b/headless-services/commons/commons-boot-app-cli/src/main/java/org/springframework/ide/vscode/commons/boot/app/cli/SpringBootApp.java @@ -108,7 +108,9 @@ public class SpringBootApp { try { Properties sysprops = this.vm.getSystemProperties(); return sysprops.getProperty("sts4.languageserver.name") == null - && sysprops.getProperty("java.protocol.handler.pkgs").equals("org.springframework.boot.loader"); + // Note: java.protocol.handler.pkgs may be not be in system properties, and result in NPE (at least in Mac OS) + // To avoid NPE, just reversed the equality check + && "org.springframework.boot.loader".equals(sysprops.getProperty("java.protocol.handler.pkgs")); } catch (Exception e) { Log.log(e); }