diff options
| author | Reinier Zwitserloot <reinier@zwitserloot.com> | 2009-12-30 03:25:57 +0100 |
|---|---|---|
| committer | Reinier Zwitserloot <reinier@zwitserloot.com> | 2009-12-30 03:25:57 +0100 |
| commit | 87044b0bc58b7084c3e207794fde14ed75ff18bc (patch) | |
| tree | 0fea307bab599c98c68d6bae28fe916891d35f4c /src/installer/lombok/installer/netbeans/NetbeansFinder.java | |
| parent | cf11641c8a5973b181f779c6fe20b9d81a7f866a (diff) | |
| download | lombok-87044b0bc58b7084c3e207794fde14ed75ff18bc.tar.gz lombok-87044b0bc58b7084c3e207794fde14ed75ff18bc.tar.bz2 lombok-87044b0bc58b7084c3e207794fde14ed75ff18bc.zip | |
Fix for the installer crashing with NPE on line 589.
Diffstat (limited to 'src/installer/lombok/installer/netbeans/NetbeansFinder.java')
| -rw-r--r-- | src/installer/lombok/installer/netbeans/NetbeansFinder.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/src/installer/lombok/installer/netbeans/NetbeansFinder.java b/src/installer/lombok/installer/netbeans/NetbeansFinder.java index 16dbf251..28cdffac 100644 --- a/src/installer/lombok/installer/netbeans/NetbeansFinder.java +++ b/src/installer/lombok/installer/netbeans/NetbeansFinder.java @@ -69,7 +69,8 @@ public class NetbeansFinder extends IdeFinder { String netbeansLocation = findNetbeansOnWindows1(dir); if (netbeansLocation != null) { try { - locations.add(NetbeansLocationProvider.create0(netbeansLocation)); + IdeLocation newLocation = NetbeansLocationProvider.create0(netbeansLocation); + if (newLocation != null) locations.add(newLocation); } catch (CorruptedIdeLocationException e) { problems.add(e); } @@ -85,7 +86,8 @@ public class NetbeansFinder extends IdeFinder { String netbeansLocation = findNetbeansOnWindows1(dir2); if (netbeansLocation != null) { try { - locations.add(NetbeansLocationProvider.create0(netbeansLocation)); + IdeLocation newLocation = NetbeansLocationProvider.create0(netbeansLocation); + if (newLocation != null) locations.add(newLocation); } catch (CorruptedIdeLocationException e) { problems.add(e); } @@ -153,7 +155,8 @@ public class NetbeansFinder extends IdeFinder { for (String guess : guesses) { try { - locations.add(NetbeansLocationProvider.create0(guess)); + IdeLocation newLocation = NetbeansLocationProvider.create0(guess); + if (newLocation != null) locations.add(newLocation); } catch (CorruptedIdeLocationException e) { problems.add(e); } @@ -179,7 +182,8 @@ public class NetbeansFinder extends IdeFinder { if (!dir.isDirectory()) continue; if (dir.getName().toLowerCase().startsWith("netbeans") && dir.getName().toLowerCase().endsWith(".app")) { try { - locations.add(NetbeansLocationProvider.create0(dir.getAbsolutePath())); + IdeLocation newLocation = NetbeansLocationProvider.create0(dir.getAbsolutePath()); + if (newLocation != null) locations.add(newLocation); } catch (CorruptedIdeLocationException e) { problems.add(e); } @@ -189,7 +193,8 @@ public class NetbeansFinder extends IdeFinder { if (!dir2.isDirectory()) continue; if (dir2.getName().toLowerCase().startsWith("netbeans") && dir2.getName().toLowerCase().endsWith(".app")) { try { - locations.add(NetbeansLocationProvider.create0(dir2.getAbsolutePath())); + IdeLocation newLocation = NetbeansLocationProvider.create0(dir2.getAbsolutePath()); + if (newLocation != null) locations.add(newLocation); } catch (CorruptedIdeLocationException e) { problems.add(e); } |