diff options
| author | Tor Norbye <tnorbye@google.com> | 2012-06-02 11:27:18 -0700 |
|---|---|---|
| committer | android code review <noreply-gerritcodereview@google.com> | 2012-06-02 11:27:19 -0700 |
| commit | 8d981a4703ed48cf200e790d1cc332a63e16f939 (patch) | |
| tree | 22bb0334d09b3d8d7d9888628d97cc29d8999b0d | |
| parent | 6de0364094c5780cf39f4805ac507374c382da2f (diff) | |
| parent | a5d04270a81ba88756ab800fa1376dc5c959c380 (diff) | |
| download | sdk-8d981a4703ed48cf200e790d1cc332a63e16f939.zip sdk-8d981a4703ed48cf200e790d1cc332a63e16f939.tar.gz sdk-8d981a4703ed48cf200e790d1cc332a63e16f939.tar.bz2 | |
Merge "Fix potential NPE"
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java index 48cebee..42423b1 100644 --- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java +++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/AdtPlugin.java @@ -1499,7 +1499,10 @@ public class AdtPlugin extends AbstractUIPlugin implements ILogger, ISdkLog { IWorkspace ws = ResourcesPlugin.getWorkspace(); GlobalProjectMonitor.stopMonitoring(ws); - mRed.dispose(); + if (mRed != null) { + mRed.dispose(); + mRed = null; + } } /** |