Fix for possible NPE in XMPPOutgoingFileTransferHelper.setConnection(null)

1 files changed, 8 insertions, 6 deletions

diff --git a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/filetransfer/XMPPOutgoingFileTransferHelper.java b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/filetransfer/XMPPOutgoingFileTransferHelper.java
index 3741d86b4..864bfcfca 100644
--- a/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/filetransfer/XMPPOutgoingFileTransferHelper.java
+++ b/providers/bundles/org.eclipse.ecf.provider.xmpp/src/org/eclipse/ecf/internal/provider/xmpp/filetransfer/XMPPOutgoingFileTransferHelper.java
@@ -148,13 +148,15 @@ public class XMPPOutgoingFileTransferHelper implements
 				}
 			}
 		} else {
-			synchronized (incomingListeners) {
-				for (Iterator i = incomingListeners.iterator(); i.hasNext();) {
-					XMPPFileTransferRequestListener ftl = (XMPPFileTransferRequestListener) i
-							.next();
-					this.manager.removeFileTransferListener(ftl);
+			if (this.manager != null) {
+				synchronized (incomingListeners) {
+					for (Iterator i = incomingListeners.iterator(); i.hasNext();) {
+						XMPPFileTransferRequestListener ftl = (XMPPFileTransferRequestListener) i
+								.next();
+						this.manager.removeFileTransferListener(ftl);
+					}
+					this.manager = null;
 				}
-				this.manager = null;
 			}
 		}
 	}