From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Tue, 16 Apr 2013 20:53:34 +0000 (+0200)
Subject: Remove downloads correctly.
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=6721687a11d53eeda4bfeea4ada2f5caffbcad7e;p=xudocci.git

Remove downloads correctly.
---

diff --git a/src/main/java/net/pterodactylus/xdcc/core/Core.java b/src/main/java/net/pterodactylus/xdcc/core/Core.java
index 3c3e457..9d5dcb7 100644
--- a/src/main/java/net/pterodactylus/xdcc/core/Core.java
+++ b/src/main/java/net/pterodactylus/xdcc/core/Core.java
@@ -583,7 +583,7 @@ public class Core extends AbstractExecutionThreadService {
 				}
 
 				/* remove download. */
-				downloads.remove(download);
+				downloads.remove(download.pack().name());
 				return;
 			}
 
@@ -630,7 +630,7 @@ public class Core extends AbstractExecutionThreadService {
 				eventBus.post(new GenericError(String.format("Download %s from %s does not start at the right position!")));
 				logger.log(Level.WARNING, String.format("Download %s from %s: have %d bytes but wants to resume from %d!", dccAcceptReceived.filename(), dccAcceptReceived.source(), outputFile.length(), dccAcceptReceived.position()));
 
-				downloads.remove(download);
+				downloads.remove(download.pack().name());
 				return;
 			}
 			OutputStream outputStream = new FileOutputStream(outputFile, true);
@@ -664,7 +664,7 @@ public class Core extends AbstractExecutionThreadService {
 			file.renameTo(new File(finalDirectory, download.pack().name()));
 			eventBus.post(new DownloadFinished(download));
 			dccReceivers.remove(dccDownloadFinished.dccReceiver());
-			downloads.remove(download);
+			downloads.remove(download.pack().name());
 		} catch (IOException ioe1) {
 			/* TODO - handle all the errors. */
 			logger.log(Level.WARNING, String.format("Could not move file %s to directory %s.", download.filename(), finalDirectory), ioe1);
@@ -689,7 +689,7 @@ public class Core extends AbstractExecutionThreadService {
 			Closeables.close(download.outputStream(), true);
 			eventBus.post(new DownloadFailed(download));
 			dccReceivers.remove(dccDownloadFailed.dccReceiver());
-			downloads.remove(download);
+			downloads.remove(download.pack().name());
 		} catch (IOException ioe1) {
 			/* swallow silently. */
 		}