MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[platform] NPE in half-initialized app (ZD-814904)

Browse Source
This commit is contained in:
Roman Shevchenko
2016-11-28 16:43:38 +01:00
parent bd50525be3
commit 34e4021582
1 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
+14 -7
View File
@@ -379,25 +379,28 @@ public class ApplicationImpl extends PlatformComponentManagerImpl implements App
return myInvokator;
}
@Override
public void invokeLater(@NotNull final Runnable runnable) {
public void invokeLater(@NotNull Runnable runnable) {
invokeLater(runnable, getDisposed());
}
@Override
public void invokeLater(@NotNull final Runnable runnable, @NotNull final Condition expired) {
public void invokeLater(@NotNull Runnable runnable, @NotNull Condition expired) {
invokeLater(runnable, ModalityState.defaultModalityState(), expired);
}
@Override
public void invokeLater(@NotNull final Runnable runnable, @NotNull final ModalityState state) {
public void invokeLater(@NotNull Runnable runnable, @NotNull ModalityState state) {
invokeLater(runnable, state, getDisposed());
}
@Override
public void invokeLater(@NotNull final Runnable runnable, @NotNull final ModalityState state, @NotNull final Condition expired) {
myInvokator.invokeLater(((TransactionGuardImpl)TransactionGuard.getInstance()).wrapLaterInvocation(runnable, state), state, expired);
public void invokeLater(@NotNull Runnable runnable, @NotNull ModalityState state, @NotNull Condition expired) {
TransactionGuard guard = TransactionGuard.getInstance();
if (guard != null) {
runnable = ((TransactionGuardImpl)guard).wrapLaterInvocation(runnable, state);
}
myInvokator.invokeLater(runnable, state, expired);
}
@Override
@@ -671,7 +674,11 @@ public class ApplicationImpl extends PlatformComponentManagerImpl implements App
LOG.error("Calling invokeAndWait from read-action leads to possible deadlock.");
}
LaterInvocator.invokeAndWait(((TransactionGuardImpl)TransactionGuard.getInstance()).wrapLaterInvocation(runnable, modalityState), modalityState);
TransactionGuard guard = TransactionGuard.getInstance();
if (guard != null) {
runnable = ((TransactionGuardImpl)guard).wrapLaterInvocation(runnable, modalityState);
}
LaterInvocator.invokeAndWait(runnable, modalityState);
}
@Override