FIXED - bug 349038: [DataBinding] NPE in SimplePropertyObservableListv20120118-1935v20120106-1400v20120106-1348v20120105-1846v20120105-1524v20120104-1552v20120103-2047v20120103-1617v20111220-1440v20111216-2204v20111216-1854v20111215-1828v20111215-1708v20111213-2031v20111212-2030v20111212-1624v20111208-1436v20111208-1250v20111207-1558v20111205-2053v20111205-2046v20111205-1826v20111205-0214v20111203-0150v20111203-0145v20111202-1652v20111202-1638v20111201-2233v20111201-2021v20111201-1641v20111201-1433v20111130-1555v20111130-0144v20111129-1932v20111129-0439v20111125-1522v20111121-1915v20111121-1701v20111118-1452v20111117-1456v20111116-1853v20111116-1635v20111115-1918v20111115-1903v20111115-1540v20111111-2053v20111110-1511v20111109-2003v20111109-1431v20111109-0641I20120105-2100I20120105-1200I20120103-1230I20111230-1130I20111223-1130I20111221-1500I20111221-0630I20111216-1500I20111214-1100I20111214-0830I20111209-2100I20111208-2000I20111208-1430I20111208-0200I20111207-0200I20111206-1015I20111206-0815I20111205-2330I20111205-1810I20111205-1315I20111205-0805I20111205-0750I20111203-0800I20111202-1500I20111201-2015I20111201-0855I20111129-2100I20111123-0610I20111116-0810

after disposal 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=349038

5 files changed, 164 insertions, 27 deletions

diff --git a/bundles/org.eclipse.core.databinding.observable/META-INF/MANIFEST.MF b/bundles/org.eclipse.core.databinding.observable/META-INF/MANIFEST.MF
index 1bdf4a16..12b7a1e8 100644
--- a/bundles/org.eclipse.core.databinding.observable/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.core.databinding.observable/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.core.databinding.observable
-Bundle-Version: 1.4.0.qualifier
+Bundle-Version: 1.4.1.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/AbstractObservableList.java b/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/AbstractObservableList.java
index 8641afb6..1bd705d8 100644
--- a/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/AbstractObservableList.java
+++ b/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/AbstractObservableList.java
@@ -8,7 +8,8 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     Brad Reynolds - bugs 164653, 167204
- *     Matthew Hall - bugs 118516, 208858, 208332, 247367, 146397, 249526
+ *     Matthew Hall - bugs 118516, 208858, 208332, 247367, 146397, 249526,
+ *                    349038
  *******************************************************************************/
 
 package org.eclipse.core.databinding.observable.list;
@@ -63,7 +64,7 @@ public abstract class AbstractObservableList extends AbstractList implements
 
 	private final Realm realm;
 	private PrivateChangeSupport changeSupport;
-	private boolean disposed = false;
+	private volatile boolean disposed = false;
 
 	/**
 	 * @param realm 
@@ -89,8 +90,8 @@ public abstract class AbstractObservableList extends AbstractList implements
 	 * @return whether this observable list has any registered listeners.
 	 * @since 1.2
 	 */
-	protected boolean hasListeners() {
-		return changeSupport.hasListeners();
+	protected synchronized boolean hasListeners() {
+		return !disposed && changeSupport.hasListeners();
 	}
 
 	public boolean isStale() {
@@ -99,13 +100,15 @@ public abstract class AbstractObservableList extends AbstractList implements
 	}
 
 	public synchronized void addListChangeListener(IListChangeListener listener) {
-		if (!disposed)
+		if (!disposed) {
 			changeSupport.addListener(ListChangeEvent.TYPE, listener);
+		}
 	}
 
 	public synchronized void removeListChangeListener(IListChangeListener listener) {
-		if (!disposed)
+		if (!disposed) {
 			changeSupport.removeListener(ListChangeEvent.TYPE, listener);
+		}
 	}
 
 	protected void fireListChange(ListDiff diff) {
@@ -115,30 +118,34 @@ public abstract class AbstractObservableList extends AbstractList implements
 	}
 
 	public synchronized void addChangeListener(IChangeListener listener) {
-		if (!disposed)
+		if (!disposed) {
 			changeSupport.addChangeListener(listener);
+		}
 	}
 
 	public synchronized void removeChangeListener(IChangeListener listener) {
-		if (!disposed)
+		if (!disposed) {
 			changeSupport.removeChangeListener(listener);
+		}
 	}
 
 	public synchronized void addStaleListener(IStaleListener listener) {
-		if (!disposed)
+		if (!disposed) {
 			changeSupport.addStaleListener(listener);
+		}
 	}
 
 	public synchronized void removeStaleListener(IStaleListener listener) {
-		if (!disposed)
+		if (!disposed) {
 			changeSupport.removeStaleListener(listener);
+		}
 	}
 
 	/**
 	 * @since 1.2
 	 */
 	public synchronized void addDisposeListener(IDisposeListener listener) {
-		if (changeSupport != null) {
+		if (!disposed) {
 			changeSupport.addDisposeListener(listener);
 		}
 	}
@@ -147,7 +154,7 @@ public abstract class AbstractObservableList extends AbstractList implements
 	 * @since 1.2
 	 */
 	public synchronized void removeDisposeListener(IDisposeListener listener) {
-		if (changeSupport != null) {
+		if (!disposed) {
 			changeSupport.removeDisposeListener(listener);
 		}
 	}
diff --git a/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/AbstractObservableMap.java b/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/AbstractObservableMap.java
index fddee3ef..8d5e35a1 100644
--- a/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/AbstractObservableMap.java
+++ b/bundles/org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/AbstractObservableMap.java
@@ -8,7 +8,8 @@
  * Contributors:
  *     IBM Corporation - initial API and implementation
  *     Brad Reynolds - bug 164653
- *     Matthew Hall - bugs 118516, 146397, 226289, 246103, 249526, 264307
+ *     Matthew Hall - bugs 118516, 146397, 226289, 246103, 249526, 264307,
+ *                    349038
  *******************************************************************************/
 
 package org.eclipse.core.databinding.observable.map;
@@ -60,7 +61,7 @@ public abstract class AbstractObservableMap extends AbstractMap implements
 
 	private final Realm realm;
 	private PrivateChangeSupport changeSupport;
-	private boolean disposed = false;
+	private volatile boolean disposed = false;
 
 	private boolean stale;
 
@@ -93,23 +94,27 @@ public abstract class AbstractObservableMap extends AbstractMap implements
 	}
 
 	public synchronized void addMapChangeListener(IMapChangeListener listener) {
-		if (!disposed)
+		if (!disposed) {
 			changeSupport.addListener(MapChangeEvent.TYPE, listener);
+		}
 	}
 
 	public synchronized void removeMapChangeListener(IMapChangeListener listener) {
-		if (!disposed)
+		if (!disposed) {
 			changeSupport.removeListener(MapChangeEvent.TYPE, listener);
+		}
 	}
 
 	public synchronized void addChangeListener(IChangeListener listener) {
-		if (!disposed)
+		if (!disposed) {
 			changeSupport.addChangeListener(listener);
+		}
 	}
 
 	public synchronized void addStaleListener(IStaleListener listener) {
-		if (!disposed)
+		if (!disposed) {
 			changeSupport.addStaleListener(listener);
+		}
 	}
 
 	/**
@@ -123,17 +128,19 @@ public abstract class AbstractObservableMap extends AbstractMap implements
 	/**
 	 * @since 1.2
 	 */
-	public void addDisposeListener(IDisposeListener listener) {
-		if (!disposed)
+	public synchronized void addDisposeListener(IDisposeListener listener) {
+		if (!disposed) {
 			changeSupport.addDisposeListener(listener);
+		}
 	}
 
 	/**
 	 * @since 1.2
 	 */
-	public void removeDisposeListener(IDisposeListener listener) {
-		if (!disposed)
+	public synchronized void removeDisposeListener(IDisposeListener listener) {
+		if (!disposed) {
 			changeSupport.removeDisposeListener(listener);
+		}
 	}
 
 	/**
@@ -176,11 +183,15 @@ public abstract class AbstractObservableMap extends AbstractMap implements
 	}
 
 	public synchronized void removeChangeListener(IChangeListener listener) {
-		changeSupport.removeChangeListener(listener);
+		if (!disposed) {
+			changeSupport.removeChangeListener(listener);
+		}
 	}
 
 	public synchronized void removeStaleListener(IStaleListener listener) {
-		changeSupport.removeStaleListener(listener);
+		if (!disposed) {
+			changeSupport.removeStaleListener(listener);
+		}
 	}
 
 	/**
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/AbstractObservableListTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/AbstractObservableListTest.java
index fde28d43..5bea23e2 100755
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/AbstractObservableListTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/list/AbstractObservableListTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Brad Reynolds - initial API and implementation
  *     Brad Reynolds - bug 167204
- *     Matthew Hall - bugs 208858, 213145, 247367
+ *     Matthew Hall - bugs 208858, 213145, 247367, 349038
  ******************************************************************************/
 
 package org.eclipse.core.tests.databinding.observable.list;
@@ -23,7 +23,9 @@ import junit.framework.TestSuite;
 
 import org.eclipse.core.databinding.observable.ChangeEvent;
 import org.eclipse.core.databinding.observable.Diffs;
+import org.eclipse.core.databinding.observable.DisposeEvent;
 import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.core.databinding.observable.IDisposeListener;
 import org.eclipse.core.databinding.observable.IObservable;
 import org.eclipse.core.databinding.observable.IObservableCollection;
 import org.eclipse.core.databinding.observable.IStaleListener;
@@ -174,6 +176,29 @@ public class AbstractObservableListTest extends TestCase {
 		});
 	}
 
+	public void testAddDisposeListener_AfterDispose() {
+		list.dispose();
+		list.addDisposeListener(new IDisposeListener() {
+			public void handleDispose(DisposeEvent event) {
+				// do nothing
+			}
+		});
+	}
+
+	public void testRemoveDisposeListener_AfterDispose() {
+		list.dispose();
+		list.removeDisposeListener(new IDisposeListener() {
+			public void handleDispose(DisposeEvent event) {
+				// do nothing
+			}
+		});
+	}
+
+	public void testHasListeners_AfterDispose() {
+		list.dispose();
+		list.hasListeners();
+	}
+
 	public static Test suite() {
 		TestSuite suite = new TestSuite(AbstractObservableListTest.class.getName());
 		suite.addTestSuite(AbstractObservableListTest.class);
@@ -245,6 +270,10 @@ public class AbstractObservableListTest extends TestCase {
 		protected void fireListChange(ListDiff diff) {
 			super.fireListChange(diff);
 		}
+
+		protected synchronized boolean hasListeners() {
+			return super.hasListeners();
+		}
 	}
 
 	static class MutableObservableListStub extends AbstractObservableListStub {
diff --git a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/AbstractObservableMapTest.java b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/AbstractObservableMapTest.java
index 7f617e8f..32c1d0fc 100644
--- a/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/AbstractObservableMapTest.java
+++ b/tests/org.eclipse.jface.tests.databinding/src/org/eclipse/core/tests/databinding/observable/map/AbstractObservableMapTest.java
@@ -7,6 +7,7 @@
  *
  * Contributors:
  *     Brad Reynolds - initial API and implementation
+ *     Matthew Hall - bug 349038
  ******************************************************************************/
 
 package org.eclipse.core.tests.databinding.observable.map;
@@ -15,7 +16,15 @@ import java.util.Set;
 
 import junit.framework.TestCase;
 
+import org.eclipse.core.databinding.observable.ChangeEvent;
+import org.eclipse.core.databinding.observable.DisposeEvent;
+import org.eclipse.core.databinding.observable.IChangeListener;
+import org.eclipse.core.databinding.observable.IDisposeListener;
+import org.eclipse.core.databinding.observable.IStaleListener;
+import org.eclipse.core.databinding.observable.StaleEvent;
 import org.eclipse.core.databinding.observable.map.AbstractObservableMap;
+import org.eclipse.core.databinding.observable.map.IMapChangeListener;
+import org.eclipse.core.databinding.observable.map.MapChangeEvent;
 import org.eclipse.core.databinding.observable.map.MapDiff;
 import org.eclipse.jface.databinding.conformance.util.CurrentRealm;
 import org.eclipse.jface.databinding.conformance.util.RealmTester;
@@ -74,7 +83,84 @@ public class AbstractObservableMapTest extends TestCase {
 			}
 		});
 	}
-	
+
+	public void testAddListChangeListener_AfterDispose() {
+		map.dispose();
+		map.addMapChangeListener(new IMapChangeListener() {
+			public void handleMapChange(MapChangeEvent event) {
+				// do nothing
+			}
+		});
+	}
+
+	public void testRemoveListChangeListener_AfterDispose() {
+		map.dispose();
+		map.removeMapChangeListener(new IMapChangeListener() {
+			public void handleMapChange(MapChangeEvent event) {
+				// do nothing
+			}
+		});
+	}
+
+	public void testAddChangeListener_AfterDispose() {
+		map.dispose();
+		map.addChangeListener(new IChangeListener() {
+			public void handleChange(ChangeEvent event) {
+				// do nothing
+			}
+		});
+	}
+
+	public void testRemoveChangeListener_AfterDispose() {
+		map.dispose();
+		map.removeChangeListener(new IChangeListener() {
+			public void handleChange(ChangeEvent event) {
+				// do nothing
+			}
+		});
+	}
+
+	public void testAddStaleListener_AfterDispose() {
+		map.dispose();
+		map.addStaleListener(new IStaleListener() {
+			public void handleStale(StaleEvent staleEvent) {
+				// do nothing
+			}
+		});
+	}
+
+	public void testRemoveStaleListener_AfterDispose() {
+		map.dispose();
+		map.removeStaleListener(new IStaleListener() {
+			public void handleStale(StaleEvent staleEvent) {
+				// do nothing
+			}
+		});
+	}
+
+	public void testAddDisposeListener_AfterDispose() {
+		map.dispose();
+		map.addDisposeListener(new IDisposeListener() {
+			public void handleDispose(DisposeEvent event) {
+				// do nothing
+			}
+		});
+	}
+
+	public void testRemoveDisposeListener_AfterDispose() {
+		map.dispose();
+		map.removeDisposeListener(new IDisposeListener() {
+			public void handleDispose(DisposeEvent event) {
+				// do nothing
+			}
+		});
+	}
+
+	public void testHasListeners_AfterDispose() {
+		map.dispose();
+		map.hasListeners();
+	}
+
 	static class AbstractObservableMapStub extends AbstractObservableMap {
 		public Set entrySet() {
 			return null;
@@ -91,5 +177,9 @@ public class AbstractObservableMapTest extends TestCase {
 		protected void fireStale() {
 			super.fireStale();
 		}
+
+		protected synchronized boolean hasListeners() {
+			return super.hasListeners();
+		}
 	}
 }