Bug 106361 - NPE when adding a new JRE
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMLibraryBlock.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMLibraryBlock.java
index bc3e72c..5e76d02 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMLibraryBlock.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/jres/VMLibraryBlock.java
@@ -567,10 +567,12 @@
protected boolean isDefaultLocations() {
LibraryLocation[] libraryLocations = fLibraryContentProvider.getLibraries();
- if (libraryLocations == null) {
+ IVMInstall install = getVMInstall();
+
+ if (install == null || libraryLocations == null) {
return true;
}
- File installLocation = getVMInstall().getInstallLocation();
+ File installLocation = install.getInstallLocation();
if (installLocation != null) {
LibraryLocation[] def = getVMInstallType().getDefaultLibraryLocations(installLocation);
if (def.length == libraryLocations.length) {
