fix timeoutexception during upload/download

Meegosame · Oct 31, 2019 · 2bef783 · 2bef783
1 parent c4989d6
commit 2bef783
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/FluentFTP/Client/FtpClient_HighLevelDownload.cs b/FluentFTP/Client/FtpClient_HighLevelDownload.cs
@@ -697,10 +697,10 @@ private bool DownloadFileInternal(string remotePath, Stream outStream, long rest
 							throw;
 						}
 					}
-					catch (FtpException ex) {
+					catch (TimeoutException ex) {
 						// fix: attempting to download data after we reached the end of the stream
 						// often throws a timeout execption, so we silently absorb that here
-						if (offset >= fileLen && ex.InnerException != null && ex.InnerException is TimeoutException) {
+						if (offset >= fileLen) {
 							break;
 						}
 						else {
@@ -843,10 +843,10 @@ private bool DownloadFileInternal(string remotePath, Stream outStream, long rest
 							throw;
 						}
 					}
-					catch (FtpException ex) {
+					catch (TimeoutException ex) {
 						// fix: attempting to download data after we reached the end of the stream
 						// often throws a timeout execption, so we silently absorb that here
-						if (offset >= fileLen && ex.InnerException != null && ex.InnerException is TimeoutException) {
+						if (offset >= fileLen) {
 							break;
 						}
 						else {

diff --git a/FluentFTP/Client/FtpClient_HighLevelUpload.cs b/FluentFTP/Client/FtpClient_HighLevelUpload.cs
@@ -757,10 +757,10 @@ private bool UploadFileInternal(Stream fileData, string remotePath, bool createR
 							throw;
 						}
 					}
-					catch (FtpException ex) {
+					catch (TimeoutException ex) {
 						// fix: attempting to upload data after we reached the end of the stream
 						// often throws a timeout execption, so we silently absorb that here
-						if (offset >= fileLen && ex.InnerException != null && ex.InnerException is TimeoutException) {
+						if (offset >= fileLen) {
 							break;
 						}
 						else {
@@ -978,10 +978,10 @@ private bool UploadFileInternal(Stream fileData, string remotePath, bool createR
 							throw;
 						}
 					}
-					catch (FtpException ex) {
+					catch (TimeoutException ex) {
 						// fix: attempting to upload data after we reached the end of the stream
 						// often throws a timeout execption, so we silently absorb that here
-						if (offset >= fileLen && ex.InnerException != null && ex.InnerException is TimeoutException) {
+						if (offset >= fileLen) {
 							break;
 						}
 						else {