mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-06 15:55:47 +02:00
Code Issues Wiki Activity

[286122] Avoid NPE when restoring memento

Browse source
This commit is contained in:
Martin Oberhuber 2009-08-10 14:02:00 +00:00
parent a941b54180
commit b55325c87d
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/internal/ui/view/SystemViewPart.java
View file

@ -38,6 +38,7 @@
* Li Ding (IBM) - [256135] Subsystem not restored in system view tree if subsystem configuration does not support filter * Li Ding (IBM) - [256135] Subsystem not restored in system view tree if subsystem configuration does not support filter
* David McKnight (IBM) - [257721] Doubleclick doing special handling and expanding * David McKnight (IBM) - [257721] Doubleclick doing special handling and expanding
* David McKnight (IBM) - [250417] Restore from memento flag set to false during restore on startup * David McKnight (IBM) - [250417] Restore from memento flag set to false during restore on startup
* Martin Oberhuber (Wind River) - [286122] Avoid NPE when restoring memento
*******************************************************************************/ *******************************************************************************/
package org.eclipse.rse.internal.ui.view; package org.eclipse.rse.internal.ui.view;
@ -1350,7 +1351,7 @@ public class SystemViewPart
// filter or filter string (depends on showFilterPools) or remote object (depends on showFilterStrings) // filter or filter string (depends on showFilterPools) or remote object (depends on showFilterStrings)
case 4 : case 4 :
if (!(subsystem.getSubSystemConfiguration().supportsFilters())) { if (subsystem != null && !(subsystem.getSubSystemConfiguration().supportsFilters())) {
remoteObject = new RemoteObject(token, subsystem, null, null); remoteObject = new RemoteObject(token, subsystem, null, null);
break; break;
} }
@ -1392,7 +1393,7 @@ public class SystemViewPart
// filter string (depends on showFilterStrings) or remote object // filter string (depends on showFilterStrings) or remote object
case 5 : case 5 :
if (!(subsystem.getSubSystemConfiguration().supportsFilters())) { if (subsystem!=null && !(subsystem.getSubSystemConfiguration().supportsFilters())) {
remoteObject = new RemoteObject(token, subsystem, null, null); remoteObject = new RemoteObject(token, subsystem, null, null);
break; break;
} }
@ -1418,7 +1419,7 @@ public class SystemViewPart
break; break;
default : // definitely a remote object default : // definitely a remote object
if (!(subsystem.getSubSystemConfiguration().supportsFilters())) { if (subsystem!=null && !(subsystem.getSubSystemConfiguration().supportsFilters())) {
remoteObject = new RemoteObject(token, subsystem, null, null); remoteObject = new RemoteObject(token, subsystem, null, null);
break; break;
} }