Bug 227477 - IModelProxy.init() and installed() are called inside a synchronized() block in ModelContentProvider

1 files changed, 19 insertions, 7 deletions

diff --git a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ModelContentProvider.java b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ModelContentProvider.java
index 7c26f3f91..0491a7e6e 100644
--- a/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ModelContentProvider.java
+++ b/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/viewers/model/ModelContentProvider.java
@@ -780,20 +780,32 @@ abstract class ModelContentProvider implements IContentProvider, IModelChangedLi
 					Job job = new Job("Model Proxy installed notification job") {//$NON-NLS-1$
 						protected IStatus run(IProgressMonitor monitor) {
 							if (!monitor.isCanceled()) {
+							    IPresentationContext context = null;
+							    Viewer viewer = null;
 								synchronized (ModelContentProvider.this) {
 									if (!isDisposed()) {
-										proxy.init(getPresentationContext());
-										Object[] mcls = fModelListeners.getListeners();
-										for (int i = 0; i < mcls.length; i++) {
-											proxy.addModelChangedListener((IModelChangedListener) mcls[i]);
-										}
-										proxy.addModelChangedListener(ModelContentProvider.this);
-										proxy.installed(getViewer());
+									    context = getPresentationContext();
+									    viewer = getViewer();
 									}
 								}
+								if (context != null && !proxy.isDisposed()) {
+    								proxy.init(context);
+    								Object[] mcls = fModelListeners.getListeners();
+    								for (int i = 0; i < mcls.length; i++) {
+    									proxy.addModelChangedListener((IModelChangedListener) mcls[i]);
+    								}
+    								proxy.addModelChangedListener(ModelContentProvider.this);
+    								proxy.installed(viewer);
+								}
 							}
 							return Status.OK_STATUS;
 						}
+						/* (non-Javadoc)
+						 * @see org.eclipse.core.runtime.jobs.Job#shouldRun()
+						 */
+						public boolean shouldRun() {
+						    return !isDisposed();
+						}
 					};
 					job.setSystem(true);
 					job.schedule();