modified cleanup

sbawaska · Aug 24, 2015 · 5870590 · 5870590
1 parent 477bb3a
commit 5870590
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/s3/src/main/java/com/yahoo/ycsb/db/S3Client.java b/s3/src/main/java/com/yahoo/ycsb/db/S3Client.java
@@ -72,11 +72,14 @@ public class S3Client extends DB {
   */
   @Override
   public void cleanup() throws DBException {
-    try {
-      this.s3Client.shutdown(); //this should not be used
-      //this.s3Client = null;
-    } catch (Exception e){
-      e.printStackTrace();
+    if(this.s3Client != null){
+      try {
+        this.s3Client.shutdown();
+      } catch (Exception e){
+        e.printStackTrace();
+      } finally {
+        this.s3Client = null;
+      }
     }
   }
   /**