mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00
Code Issues Wiki Activity

Bug 344739 - RejectedExecutionException when terminating a PDA launch

Browse source 
Change-Id: I28cdfcd9aef6c7ece39c29b82459825698dc71bc
Signed-off-by: Marc Khouzam <marc.khouzam@ericsson.com>
Reviewed-on: https://git.eclipse.org/r/29488
This commit is contained in:
Marc Khouzam 2014-07-04 13:33:17 -04:00
parent 875e21efb0
commit bb3fd559c9
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dsf/org.eclipse.cdt.examples.dsf.pda.ui/src/org/eclipse/cdt/examples/dsf/pda/ui/PDAAdapterFactory.java
View file

@ -48,6 +48,7 @@ public class PDAAdapterFactory implements IAdapterFactory
if (session == null) return null; if (session == null) return null;
SessionAdapterSet adapterSet = PDAUIPlugin.getDefault().getAdapterSet(launch); SessionAdapterSet adapterSet = PDAUIPlugin.getDefault().getAdapterSet(launch);
if (adapterSet == null) return null;
// Returns the adapter type for the launch object. // Returns the adapter type for the launch object.
if (adapterType.equals(IElementContentProvider.class)) return adapterSet.fViewModelAdapter; if (adapterType.equals(IElementContentProvider.class)) return adapterSet.fViewModelAdapter;

9
dsf/org.eclipse.cdt.examples.dsf.pda/src/org/eclipse/cdt/examples/dsf/pda/launch/PDALaunch.java
View file

@ -245,7 +245,6 @@ implements ITerminate
DsfSession.endSession(fSession); DsfSession.endSession(fSession);
// endSession takes a full dispatch to distribute the // endSession takes a full dispatch to distribute the
// session-ended event, finish step only after the dispatch. // session-ended event, finish step only after the dispatch.
fExecutor.shutdown();
fireTerminate(); fireTerminate();
rm.setStatus(getStatus()); rm.setStatus(getStatus());
@ -262,4 +261,12 @@ implements ITerminate
Platform.getAdapterManager().loadAdapter(this, adapter.getName()); Platform.getAdapterManager().loadAdapter(this, adapter.getName());
return super.getAdapter(adapter); return super.getAdapter(adapter);
} }
@Override
public void launchRemoved(ILaunch launch) {
if (this.equals(launch)) {
fExecutor.shutdown();
}
super.launchRemoved(launch);
}
} }