Fix null pointer exception with dataSourceManager in TrackDataHub

This commit is contained in:
Jimmy Shih
2013-08-23 12:51:53 -07:00
parent 635006efae
commit 6ce0db575f
@@ -117,8 +117,10 @@ public class TrackDataHub implements DataSourceListener {
runInHanderThread(new Runnable() { runInHanderThread(new Runnable() {
@Override @Override
public void run() { public void run() {
dataSourceManager.updateListeners(trackDataManager.getRegisteredTrackDataTypes()); if (dataSourceManager != null) {
loadDataForAll(); dataSourceManager.updateListeners(trackDataManager.getRegisteredTrackDataTypes());
loadDataForAll();
}
} }
}); });
} }
@@ -173,9 +175,11 @@ public class TrackDataHub implements DataSourceListener {
runInHanderThread(new Runnable() { runInHanderThread(new Runnable() {
@Override @Override
public void run() { public void run() {
trackDataManager.registerListener(trackDataListener, trackDataTypes); if (dataSourceManager != null) {
dataSourceManager.updateListeners(trackDataManager.getRegisteredTrackDataTypes()); trackDataManager.registerListener(trackDataListener, trackDataTypes);
loadDataForListener(trackDataListener); dataSourceManager.updateListeners(trackDataManager.getRegisteredTrackDataTypes());
loadDataForListener(trackDataListener);
}
} }
}); });
} }
@@ -189,8 +193,10 @@ public class TrackDataHub implements DataSourceListener {
runInHanderThread(new Runnable() { runInHanderThread(new Runnable() {
@Override @Override
public void run() { public void run() {
trackDataManager.unregisterListener(trackDataListener); if (dataSourceManager != null) {
dataSourceManager.updateListeners(trackDataManager.getRegisteredTrackDataTypes()); trackDataManager.unregisterListener(trackDataListener);
dataSourceManager.updateListeners(trackDataManager.getRegisteredTrackDataTypes());
}
} }
}); });
} }