mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-17 14:05:23 +02:00
Fix concurrent mod exception with listeners.
Change-Id: If5088b530606421b573359b7755a01e45e32f0a7
This commit is contained in:
parent
c5a2c150ae
commit
accbe9abc4
1 changed files with 35 additions and 23 deletions
|
@ -610,11 +610,13 @@ public class LaunchBarManager implements ILaunchBarManager, ILaunchTargetListene
|
||||||
private void fireActiveLaunchDescriptorChanged() {
|
private void fireActiveLaunchDescriptorChanged() {
|
||||||
if (!initialized)
|
if (!initialized)
|
||||||
return;
|
return;
|
||||||
for (ILaunchBarListener listener : listeners) {
|
synchronized (listeners) {
|
||||||
try {
|
for (ILaunchBarListener listener : listeners) {
|
||||||
listener.activeLaunchDescriptorChanged(activeLaunchDesc);
|
try {
|
||||||
} catch (Exception e) {
|
listener.activeLaunchDescriptorChanged(activeLaunchDesc);
|
||||||
Activator.log(e);
|
} catch (Exception e) {
|
||||||
|
Activator.log(e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -673,11 +675,13 @@ public class LaunchBarManager implements ILaunchBarManager, ILaunchTargetListene
|
||||||
private void fireActiveLaunchModeChanged() {
|
private void fireActiveLaunchModeChanged() {
|
||||||
if (!initialized)
|
if (!initialized)
|
||||||
return;
|
return;
|
||||||
for (ILaunchBarListener listener : listeners) {
|
synchronized (listeners) {
|
||||||
try {
|
for (ILaunchBarListener listener : listeners) {
|
||||||
listener.activeLaunchModeChanged(activeLaunchMode);
|
try {
|
||||||
} catch (Exception e) {
|
listener.activeLaunchModeChanged(activeLaunchMode);
|
||||||
Activator.log(e);
|
} catch (Exception e) {
|
||||||
|
Activator.log(e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -764,11 +768,13 @@ public class LaunchBarManager implements ILaunchBarManager, ILaunchTargetListene
|
||||||
private void fireActiveLaunchTargetChanged() {
|
private void fireActiveLaunchTargetChanged() {
|
||||||
if (!initialized)
|
if (!initialized)
|
||||||
return;
|
return;
|
||||||
for (ILaunchBarListener listener : listeners) {
|
synchronized (listeners) {
|
||||||
try {
|
for (ILaunchBarListener listener : listeners) {
|
||||||
listener.activeLaunchTargetChanged(activeLaunchTarget);
|
try {
|
||||||
} catch (Exception e) {
|
listener.activeLaunchTargetChanged(activeLaunchTarget);
|
||||||
Activator.log(e);
|
} catch (Exception e) {
|
||||||
|
Activator.log(e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -823,15 +829,19 @@ public class LaunchBarManager implements ILaunchBarManager, ILaunchTargetListene
|
||||||
public void addListener(ILaunchBarListener listener) {
|
public void addListener(ILaunchBarListener listener) {
|
||||||
if (listener == null)
|
if (listener == null)
|
||||||
return;
|
return;
|
||||||
if (!listeners.contains(listener)) // cannot add duplicates
|
synchronized (listeners) {
|
||||||
listeners.add(listener);
|
if (!listeners.contains(listener)) // cannot add duplicates
|
||||||
|
listeners.add(listener);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void removeListener(ILaunchBarListener listener) {
|
public void removeListener(ILaunchBarListener listener) {
|
||||||
if (listener == null)
|
if (listener == null)
|
||||||
return;
|
return;
|
||||||
listeners.remove(listener);
|
synchronized (listener) {
|
||||||
|
listeners.remove(listener);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -912,11 +922,13 @@ public class LaunchBarManager implements ILaunchBarManager, ILaunchTargetListene
|
||||||
private void fireLaunchTargetsChanged() {
|
private void fireLaunchTargetsChanged() {
|
||||||
if (!initialized)
|
if (!initialized)
|
||||||
return;
|
return;
|
||||||
for (ILaunchBarListener listener : listeners) {
|
synchronized (listeners) {
|
||||||
try {
|
for (ILaunchBarListener listener : listeners) {
|
||||||
listener.launchTargetsChanged();
|
try {
|
||||||
} catch (Exception e) {
|
listener.launchTargetsChanged();
|
||||||
Activator.log(e);
|
} catch (Exception e) {
|
||||||
|
Activator.log(e);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue