summaryrefslogtreecommitdiffstats
path: root/idrop-lite
diff options
context:
space:
mode:
authorLISA STILLWELL <lisa@dhcp152-54-6-218.wireless.europa.renci.org>2011-10-07 21:04:47 (GMT)
committer LISA STILLWELL <lisa@dhcp152-54-6-218.wireless.europa.renci.org>2011-10-07 21:04:47 (GMT)
commit6a22d9cb9e14439ee5124580786a0a9303ad52cb (patch)
tree315ce51cb86ec139a027080fd26a8806c8b6bc0b /idrop-lite
parentb9e6e8d4b21bd007ec3c625105a9d1e796e9a8ea (diff)
downloadQCG-Data-6a22d9cb9e14439ee5124580786a0a9303ad52cb.zip
QCG-Data-6a22d9cb9e14439ee5124580786a0a9303ad52cb.tar.gz
QCG-Data-6a22d9cb9e14439ee5124580786a0a9303ad52cb.tar.bz2
[#427] fix build error caused by merge
Diffstat (limited to 'idrop-lite')
-rw-r--r--idrop-lite/src/main/java/org/irods/jargon/idrop/lite/iDropLiteApplet.java6
1 files changed, 3 insertions, 3 deletions
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 1692a49..0db1610 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
@@ -1853,16 +1853,16 @@ public class iDropLiteApplet extends javax.swing.JApplet implements TransferStat
final Thread transferThread = new Thread(currentTransferRunner);
log.info("launching transfer thread");
// close so that transfer thread can grab account
- irodsFileSystem.closeAndEatExceptions();
+ irodsFileSystem.closeAndEatExceptions(); // ask Mike about this
transferThread.start();
- transferThread.join();
+ transferThread.join(); // ask Mike about this
} catch (Exception e) {
log.error("exception choosings iRODS file");
throw new IdropRuntimeException("exception choosing irods file", e);
} finally {
iDropCore.getIrodsFileSystem().closeAndEatExceptions();
}
- // }
+ }
}//GEN-LAST:event_btnUploadBeginImportActionPerformed