svn commit: r1766495 - /jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreBlobGCIT.java

[amitj]

Author: amitj
Date: Tue Oct 25 09:38:04 2016
New Revision: 1766495

URL: http://svn.apache.org/viewvc?rev=1766495&view=rev
Log:
OAK-4868: Update SegmentS3DataStoreBlobGCTest in oak-it once oak-segment-tar 
0.0.18 released

* Removed calls to super clean up methods as already tagged with @After
* Checked for bucket null or empty before cleaning up

Modified:
    
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreBlobGCIT.java

Modified: 
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreBlobGCIT.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreBlobGCIT.java?rev=1766495&r1=1766494&r2=1766495&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreBlobGCIT.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-it/src/test/java/org/apache/jackrabbit/oak/segment/SegmentS3DataStoreBlobGCIT.java
 Tue Oct 25 09:38:04 2016
@@ -28,6 +28,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Properties;
 
+import com.google.common.base.Strings;
 import org.apache.jackrabbit.oak.blob.cloud.s3.S3Constants;
 import org.apache.jackrabbit.oak.blob.cloud.s3.S3DataStoreUtils;
 import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
@@ -75,9 +76,9 @@ public class SegmentS3DataStoreBlobGCIT
 
     @After
     public void close() throws Exception {
-        super.closeBlobStore();
-        super.closeBlobStore();
-        S3DataStoreUtils.deleteBucket(bucket, startDate);
+        if (!Strings.isNullOrEmpty(bucket)) {
+            S3DataStoreUtils.deleteBucket(bucket, startDate);
+        }
     }
 }