Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add instrumentation to diagnose cause of CME. #11772

Merged
merged 2 commits into from
Jul 12, 2023
Merged

Add instrumentation to diagnose cause of CME. #11772

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5bffc8d
Add instrumentation to diagnose cause of CME.
asvitkine Jul 12, 2023
f7ccdad
Pass orig exception too.
asvitkine Jul 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions game-app/game-core/src/main/java/games/strategy/engine/framework/HistorySynchronizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import games.strategy.engine.data.GamePlayer;
import games.strategy.engine.history.EventChild;
import games.strategy.engine.history.HistoryWriter;
import java.util.ConcurrentModificationException;
import javax.swing.SwingUtilities;

/**
Expand Down Expand Up @@ -34,7 +35,20 @@ public void gameDataChanged(final Change change) {
public void startHistoryEvent(final String event, final Object renderingData) {
startHistoryEvent(event);
if (renderingData != null) {
setRenderingData(renderingData);
SwingUtilities.invokeLater(
() -> {
try {
final Object translatedRenderingData = translateIntoMyData(renderingData);
gameData
.getHistory()
.getHistoryWriter()
.setRenderingData(translatedRenderingData);
} catch (ConcurrentModificationException e) {
// Instrumented to diagnose what exactly is causing this.
throw new ConcurrentModificationException(
"Failed to map renderingData=" + renderingData + " for event=" + event, e);
}
});
}
}

Expand All @@ -56,14 +70,6 @@ public void addChildToEvent(final String text, final Object renderingData) {
});
}

void setRenderingData(final Object renderingData) {
SwingUtilities.invokeLater(
() -> {
final Object translatedRenderingData = translateIntoMyData(renderingData);
gameData.getHistory().getHistoryWriter().setRenderingData(translatedRenderingData);
});
}

@Override
public void stepChanged(
final String stepName,
Expand Down