2009-04-17 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>

	Code cleanup
	* src/DownloadCommand.cc

1 files changed, 5 insertions, 16 deletions

diff --git a/src/DownloadCommand.cc b/src/DownloadCommand.cc
index c47f0f8f..8b6b05ac 100644
--- a/src/DownloadCommand.cc
+++ b/src/DownloadCommand.cc
@@ -172,22 +172,11 @@ bool DownloadCommand::executeInternal() {
 	      !socket->wantRead() && !socket->wantWrite()) {
       segmentComplete = true;
     }
-  } else if(!_transferEncodingDecoder.isNull() &&
-	    !_contentEncodingDecoder.isNull()) {
-    if(_transferEncodingDecoder->finished() &&
-       _contentEncodingDecoder->finished()) {
-      segmentComplete = true;
-    }
-  } else if(!_transferEncodingDecoder.isNull() &&
-	    _contentEncodingDecoder.isNull()) {
-    if(_transferEncodingDecoder->finished()) {
-      segmentComplete = true;
-    }
-  } else if(_transferEncodingDecoder.isNull() &&
-	    !_contentEncodingDecoder.isNull()) {
-    if(_contentEncodingDecoder->finished()) {
-      segmentComplete = true;
-    }
+  } else if((_transferEncodingDecoder.isNull() ||
+	     _transferEncodingDecoder->finished()) &&
+	    (_contentEncodingDecoder.isNull() ||
+	     _contentEncodingDecoder->finished())) {
+    segmentComplete = true;
   }
 
   if(!segmentComplete && bufSize == 0 &&