Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

proper fix for --common upload

  • Loading branch information...
commit 65550d5894102706820b23bfc21a495e47e77dad 1 parent d242308
@buzztroll buzztroll authored
View
3  .idea/misc.xml
@@ -60,9 +60,6 @@
</value>
</option>
</component>
- <component name="ProjectResources">
- <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
- </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
View
2  cloud-client/builder/environment.sh
@@ -2,7 +2,7 @@ if [ ! "X$CLCLBUILDER_ENVIRONMENT_DEFINED" = "X" ]; then
return 0
fi
-export CLCLBUILDER_RELEASE_NAME="nimbus-cloud-client-019"
+export CLCLBUILDER_RELEASE_NAME="nimbus-cloud-client-020"
# #########################################################
View
4 cloud-client/nimbus-cloud-client-src/samples/base-cluster.xml
@@ -6,7 +6,7 @@
<name>head-node</name>
- <image>base-cluster-cc12.gz</image>
+ <image>base-cluster-cc14.gz</image>
<quantity>1</quantity>
@@ -41,7 +41,7 @@
<name>compute-nodes</name>
- <image>base-cluster-cc12.gz</image>
+ <image>base-cluster-cc14.gz</image>
<quantity>2</quantity>
View
4 cumulus/cb/pycb/cbPosixBackend.py
@@ -2,12 +2,8 @@
import sys
from pycb.cbException import cbException
import pycb
-import stat
-import urllib
-import glob
import errno
import logging
-import threading
import tempfile
import hashlib
import traceback
View
9 service/client/java/source/src/org/globus/workspace/cloud/client/util/CumulusTask.java
@@ -647,11 +647,6 @@ public void uploadVM(
CumulusInputStream cis = new CumulusInputStream(
file.length(), pr, s3Object.getDataInputStream(), this.args.getNoSpinner());
s3Object.setDataInputStream(cis);
- s3Service.putObject(baseBucketName, s3Object);
- progressWatcher.flush();
- s3Object.closeDataInputStream();
- cis.close();
-
if(this.args.getCommonVMSet())
{
if (pr != null) {
@@ -660,6 +655,10 @@ public void uploadVM(
AccessControlList acl = AccessControlList.REST_CANNED_PUBLIC_READ;
s3Object.setAcl(acl);
}
+ s3Service.putObject(baseBucketName, s3Object);
+ progressWatcher.flush();
+ s3Object.closeDataInputStream();
+ cis.close();
if (pr != null) {
pr.println("");

0 comments on commit 65550d5

Please sign in to comment.
Something went wrong with that request. Please try again.