Bug 530279 - Running Tomcat on JDK < 1.8 (JDK 1.6 or 1.7) causes NPE
Change-Id: I09da81368a8e1a97d7dbe933027c5fd8913d1de4
diff --git a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
index 033c0c6..515c863 100644
--- a/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
+++ b/org.eclipse.jdt.launching/launching/org/eclipse/jdt/launching/JavaRuntime.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2000, 2017 IBM Corporation and others.
+ * Copyright (c) 2000, 2018 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -1040,6 +1040,9 @@
AbstractVMInstall install = (AbstractVMInstall) vm;
String vmver = install.getJavaVersion();
// versionToJdkLevel only handles 3 char versions = 1.5, 1.6, 1.7, etc
+ if (vmver == null) {
+ return false;
+ }
if (vmver.length() > 3) {
vmver = vmver.substring(0, 3);
}