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 5e76d02..b5d7eb9 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
@@ -460,12 +460,17 @@
* The "default" button has been toggled
*/
protected void handleRestoreDefault() {
- File installLocation = getVMInstall().getInstallLocation();
+ final IVMInstall vmInstall = getVMInstall();
LibraryLocation[] libs = null;
- if (installLocation == null) {
+ if (vmInstall == null) {
libs = new LibraryLocation[0];
} else {
- libs = getVMInstallType().getDefaultLibraryLocations(installLocation);
+ File installLocation = vmInstall.getInstallLocation();
+ if (installLocation == null) {
+ libs = new LibraryLocation[0];
+ } else {
+ libs = getVMInstallType().getDefaultLibraryLocations(installLocation);
+ }
}
fLibraryContentProvider.setLibraries(libs);
update();
