summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLISA STILLWELL <lisa@dhcp152-54-6-218.wireless.europa.renci.org>2011-08-19 16:05:49 (GMT)
committer LISA STILLWELL <lisa@dhcp152-54-6-218.wireless.europa.renci.org>2011-08-19 16:05:49 (GMT)
commit1595ae3a8d54bacf5dca28976228952282b87bc6 (patch)
treeda39e0252a0858d9e2cf6301a197bba0b41918a9
parentfd544cb01ce91f138e0b7e44a90ea5047b0d9e16 (diff)
downloadQCG-Data-1595ae3a8d54bacf5dca28976228952282b87bc6.zip
QCG-Data-1595ae3a8d54bacf5dca28976228952282b87bc6.tar.gz
QCG-Data-1595ae3a8d54bacf5dca28976228952282b87bc6.tar.bz2
[#427] changed TransferControlBlock to null in put to IRODS
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/IRODSTreeTransferHandler.java2
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.java3
2 files changed, 3 insertions, 2 deletions
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/IRODSTreeTransferHandler.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/IRODSTreeTransferHandler.java
index 71a34a8..5e9a6ed 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/IRODSTreeTransferHandler.java
+++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/IRODSTreeTransferHandler.java
@@ -300,7 +300,7 @@ public class IRODSTreeTransferHandler extends TransferHandler {
idropGui.getIrodsAccount());
*/
idropGui.getiDropCore().getTransferManager().putOperation(localSourceAbsolutePath,
- targetIrodsFileAbsolutePath, sourceResource, idropGui, new TreeTransferControlBlock());
+ targetIrodsFileAbsolutePath, sourceResource, idropGui, null);
} catch (JargonException ex) {
java.util.logging.Logger.getLogger(LocalFileTree.class.getName()).log(
java.util.logging.Level.SEVERE, null, ex);
diff --git a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.java b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.java
index b72cd18..99b091f 100644
--- a/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.java
+++ b/idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.java
@@ -30,6 +30,7 @@ import javax.swing.tree.TreePath;
import org.irods.jargon.core.pub.domain.DataObject;
import org.irods.jargon.core.pub.domain.Collection;
import org.irods.jargon.core.query.CollectionAndDataObjectListingEntry;
+import org.irods.jargon.core.transfer.TransferControlBlock;
import org.irods.jargon.core.transfer.TransferStatus;
import org.irods.jargon.core.connection.IRODSAccount;
import org.irods.jargon.core.exception.JargonException;
@@ -1211,7 +1212,7 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
log.info("uploading local file:{}", fileToImport);
iDropCore.getTransferManager().putOperation(fileToImport,
targetPath, iDropCore.getIrodsAccount().getDefaultStorageResource(),
- this, new TreeTransferControlBlock());
+ this, null);
rowsToRemove[idx] = row;
idx++;
}