Bug 494822 - Pass a range specification unconditionally
When sending request for transfer of a remote file to local file storage
from FileReader.sendRetrieveRequest(URI, OutputStream, DownloadRange,
boolean, IProgressMonitor), drop redundant null check for DownloadRange
parameter and pass it to IRetrieveFileTransferContainerAdapter's
sendRetrieveRequest(IFileID, IFileRangeSpecification,
IFileTransferListener, Map) as is because a range specification for
retrieving a portion of the given remote file is allowed to be null:
If null the entire file will be retrieved (as per
sendRetrieveRequest(IFileID, IFileTransferListener, Map).
Bug: 266243
Change-Id: If957ebd23e4a229db873cb6d4df3e10d5b93c75b
Signed-off-by: Mykola Nikishov <mn@mn.com.ua>
diff --git a/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/FileReader.java b/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/FileReader.java
index 701e033..9a25565 100644
--- a/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/FileReader.java
+++ b/bundles/org.eclipse.equinox.p2.transport.ecf/src/org/eclipse/equinox/internal/p2/transport/ecf/FileReader.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2006, 2015 Cloudsmith Inc.
+ * Copyright (c) 2006, 2016 Cloudsmith Inc.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -419,11 +419,7 @@
try {
IFileID fileID = FileIDFactory.getDefault().createFileID(adapter.getRetrieveNamespace(), uri.toString());
-
- if (range != null)
- adapter.sendRetrieveRequest(fileID, range, this, options);
- else
- adapter.sendRetrieveRequest(fileID, this, options);
+ adapter.sendRetrieveRequest(fileID, range, this, options);
} catch (IncomingFileTransferException e) {
exception = e;
} catch (FileCreateException e) {
