mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-04 15:45:25 +02:00
[166156] don't call disconnect on disconnected subsystems during delete - since it causes lots of unnnecssary events
This commit is contained in:
parent
c1c163702a
commit
166f85cb21
1 changed files with 16 additions and 10 deletions
|
@ -933,12 +933,15 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration
|
|||
//System.out.println("in deleteSubSystemsByConnection. Nbr subsystems = " + subsystems.length);
|
||||
for (int idx = 0; idx < subsystems.length; idx++)
|
||||
{
|
||||
try
|
||||
{
|
||||
subsystems[idx].disconnect(); // be nice if we had a shell to pass!
|
||||
}
|
||||
catch (Exception exc)
|
||||
if (subsystems[idx].isConnected())
|
||||
{
|
||||
try
|
||||
{
|
||||
subsystems[idx].disconnect(); // be nice if we had a shell to pass!
|
||||
}
|
||||
catch (Exception exc)
|
||||
{
|
||||
}
|
||||
}
|
||||
subsystems[idx].deletingConnection(); // let subsystem do any clean up needed prior to death
|
||||
deleteSubSystem(subsystems[idx]);
|
||||
|
@ -1590,12 +1593,15 @@ public abstract class SubSystemConfiguration implements ISubSystemConfiguration
|
|||
*/
|
||||
public boolean deleteSubSystem(ISubSystem subsystem)
|
||||
{
|
||||
try
|
||||
{
|
||||
subsystem.disconnect(); // just in case.
|
||||
}
|
||||
catch (Exception exc)
|
||||
if (subsystem.isConnected())
|
||||
{
|
||||
try
|
||||
{
|
||||
subsystem.disconnect(); // just in case.
|
||||
}
|
||||
catch (Exception exc)
|
||||
{
|
||||
}
|
||||
}
|
||||
removeSubSystem(subsystem); // remove from our in-memory cache
|
||||
ISystemFilterPoolReferenceManager fpRefMgr = subsystem.getSystemFilterPoolReferenceManager();
|
||||
|
|
Loading…
Add table
Reference in a new issue