Bug 96514 NPE during sync/build

1 files changed, 6 insertions, 3 deletions

diff --git a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java
index 6337def5a..da8004220 100644
--- a/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java
+++ b/bundles/org.eclipse.team.ui/src/org/eclipse/team/internal/ui/synchronize/ActiveChangeSetCollector.java
@@ -70,7 +70,8 @@ public class ActiveChangeSetCollector implements ISyncInfoSetChangeListener {
         public void defaultSetChanged(final ChangeSet previousDefault, final ChangeSet set) {
             provider.performUpdate(new IWorkspaceRunnable() {
                 public void run(IProgressMonitor monitor) {
-                    listener.defaultSetChanged(previousDefault, set);
+                    if (listener != null)
+                        listener.defaultSetChanged(previousDefault, set);
                 }
             }, true, true);
         }
@@ -89,7 +90,8 @@ public class ActiveChangeSetCollector implements ISyncInfoSetChangeListener {
         public void nameChanged(final ChangeSet set) {
             provider.performUpdate(new IWorkspaceRunnable() {
                 public void run(IProgressMonitor monitor) {
-                    listener.nameChanged(set);
+                    if (listener != null)
+                        listener.nameChanged(set);
                 }
             }, true, true);
         }
@@ -334,7 +336,8 @@ public class ActiveChangeSetCollector implements ISyncInfoSetChangeListener {
         }
         if (added) {
             set.getSyncInfoSet().addSyncSetChangedListener(this);
-            listener.setAdded(set);
+            if (listener != null)
+                listener.setAdded(set);
         }
         return sis;
     }