Fixing merge conflicts #3921

IQSS · Jul 31, 2017 · 62308d3 · 62308d3
2 parents ecf96ba + 126080a
commit 62308d3
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java b/src/main/java/edu/harvard/iq/dataverse/dataaccess/S3AccessIO.java
@@ -12,6 +12,7 @@
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.PutObjectRequest;
 import com.amazonaws.partitions.PartitionsLoader;
+import com.amazonaws.services.s3.model.GetObjectRequest;
 import edu.harvard.iq.dataverse.DataFile;
 import edu.harvard.iq.dataverse.Dataset;
 import edu.harvard.iq.dataverse.Dataverse;
@@ -140,11 +141,19 @@ public void savePath(Path fileSystemPath) throws IOException {
                 DataFile datafile = (DataFile)dvObject;
                 String bucketName = "testiqss-1239759fgsef34w4"; //name is global, no uppercase
 
-                s3.deleteBucket(bucketName);
                 String key =  datafile.getOwner().getAuthority() + "/" + datafile.getOwner().getIdentifier() + "/" + datafile.getDisplayName();
-
-                s3.createBucket(bucketName);
-                s3.putObject(new PutObjectRequest(bucketName, key, inputFile));
+
+                if(!s3.doesBucketExist(bucketName)) { 
+                    System.out.println("Rohit Bhattacharjee!!!! True");
+                    s3.createBucket(bucketName);
+                } else { 
+                    System.out.println("Rohit Bhattacharjee!!!! False");
+                }
+//                if(s3.doesObjectExist(bucketName, key)){
+//                    System.out.println("Rohit Bhattacharjee File Exists!!");
+//                } else{
+                    s3.putObject(new PutObjectRequest(bucketName, key, inputFile));
+//                }
 
                 newFileSize = inputFile.length();
             } else {