Fix scanner object leaks close them appropriately. (minio#534)

Currently scanner was never closed which would leak fds.
vichetuc · Mar 10, 2017 · a7ae7a1 · a7ae7a1
1 parent 2a46f7b
commit a7ae7a1
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 26 deletions.
diff --git a/api/src/main/java/io/minio/MinioClient.java b/api/src/main/java/io/minio/MinioClient.java
@@ -63,7 +63,6 @@
 import org.xmlpull.v1.XmlPullParserFactory;
 
 import java.io.BufferedInputStream;
-import java.io.EOFException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -89,7 +88,6 @@
 import java.util.NoSuchElementException;
 import java.util.Scanner;
 import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -629,8 +627,7 @@ private boolean isValidEndpoint(String endpoint) {
    * Validates if given objectPrefix is valid.
    */
   private void checkObjectPrefix(String prefix) throws InvalidObjectPrefixException {
-    // TODO(nl5887): what to do with wildcards in objectPrefix?
-    //
+    // TODO(nl5887): what to do with wild-cards in objectPrefix?
     if (prefix.length() > 1024) {
       throw new InvalidObjectPrefixException(prefix, "Object prefix cannot be greater than 1024 characters.");
     }
@@ -950,23 +947,25 @@ private HttpResponse execute(Method method, String region, String bucketName, St
 
     // HEAD returns no body, and fails on parseXml
     if (!method.equals(Method.HEAD)) {
+      Scanner scanner = new Scanner(response.body().charStream());
       try {
+        scanner.useDelimiter("\\A");
         String errorXml = "";
 
         // read entire body stream to string.
-        Scanner scanner = new java.util.Scanner(response.body().charStream()).useDelimiter("\\A");
         if (scanner.hasNext()) {
           errorXml = scanner.next();
         }
 
         errorResponse = new ErrorResponse(new StringReader(errorXml));
-
         if (this.traceStream != null) {
           this.traceStream.println(errorXml);
         }
+
       } finally {
         response.body().close();
       }
+      scanner.close();
     }
 
     if (this.traceStream != null) {
@@ -1041,8 +1040,8 @@ private void updateRegionCache(String bucketName)
       String location = null;
 
       xpp.setInput(response.body().charStream());
-      while (xpp.getEventType() != xpp.END_DOCUMENT) {
-        if (xpp.getEventType() ==  xpp.START_TAG && xpp.getName() == "LocationConstraint") {
+      while (xpp.getEventType() != XmlPullParser.END_DOCUMENT) {
+        if (xpp.getEventType() ==  XmlPullParser.START_TAG && xpp.getName() == "LocationConstraint") {
           xpp.next();
           location = getText(xpp, location);
           break;
@@ -1091,7 +1090,7 @@ private String getRegion(String bucketName) throws InvalidBucketNameException, N
    * Returns text of given XML element.
    */
   private String getText(XmlPullParser xpp, String location) throws XmlPullParserException {
-    if (xpp.getEventType() == xpp.TEXT) {
+    if (xpp.getEventType() == XmlPullParser.TEXT) {
       return xpp.getText();
     }
     return location;
@@ -2938,19 +2937,17 @@ private void completeMultipart(String bucketName, String objectName, String uplo
 
     // Fixing issue https://github.com/minio/minio-java/issues/391
     String bodyContent = "";
+    Scanner scanner = new Scanner(response.body().charStream());
     try {
       // read entire body stream to string.
-      Scanner scanner = new java.util.Scanner(response.body().charStream()).useDelimiter("\\A");
+      scanner.useDelimiter("\\A");
       if (scanner.hasNext()) {
         bodyContent = scanner.next();
       }
-    } catch (EOFException e) {
-      // Getting EOF exception is not an error.
-      // Just log it.
-      LOGGER.log(Level.WARNING, "EOF exception occured: " + e);
-    }  finally {
+    } finally {
       response.body().close();
     }
+    scanner.close();
 
     bodyContent = bodyContent.trim();
     if (!bodyContent.isEmpty()) {

diff --git a/api/src/main/java/io/minio/policy/PolicyType.java b/api/src/main/java/io/minio/policy/PolicyType.java
@@ -20,8 +20,14 @@ public enum PolicyType {
   NONE("none"), READ_ONLY("readonly"), READ_WRITE("readwrite"), WRITE_ONLY("writeonly");
   private final String value;
 
-
   private PolicyType(final String value) {
     this.value = value;
   }
+
+  /**
+   * Returns the policyType value.
+   */
+  public String getValue() {
+    return value;
+  }
 }
diff --git a/functional/FunctionalTest.java b/functional/FunctionalTest.java
@@ -342,7 +342,7 @@ public static void listObject_test1() throws Exception {
     }
 
     i = 0;
-    for (Result r : client.listObjects(bucketName)) {
+    for (Result<?> r : client.listObjects(bucketName)) {
       ignore(i++, r.get());
       if (i == 10) {
         break;
@@ -369,7 +369,7 @@ public static void listObject_test2() throws Exception {
     }
 
     i = 0;
-    for (Result r : client.listObjects(bucketName, "minio")) {
+    for (Result<?> r : client.listObjects(bucketName, "minio")) {
       ignore(i++, r.get());
       if (i == 10) {
         break;
@@ -396,7 +396,7 @@ public static void listObject_test3() throws Exception {
     }
 
     i = 0;
-    for (Result r : client.listObjects(bucketName, "minio", true)) {
+    for (Result<?> r : client.listObjects(bucketName, "minio", true)) {
       ignore(i++, r.get());
       if (i == 10) {
         break;
@@ -416,7 +416,7 @@ public static void listObject_test4() throws Exception {
     System.out.println("Test: empty bucket: listObjects(final String bucketName)");
 
     i = 0;
-    for (Result r : client.listObjects(bucketName, "minio", true)) {
+    for (Result<?> r : client.listObjects(bucketName, "minio", true)) {
       ignore(i++, r.get());
       if (i == 10) {
         break;
@@ -567,10 +567,12 @@ public static void presignedGetObject_test1() throws Exception {
         String errorXml = "";
 
         // read entire body stream to string.
-        Scanner scanner = new java.util.Scanner(response.body().charStream()).useDelimiter("\\A");
+        Scanner scanner = new Scanner(response.body().charStream());
+        scanner.useDelimiter("\\A");
         if (scanner.hasNext()) {
           errorXml = scanner.next();
         }
+        scanner.close();
 
         throw new Exception("[FAILED] Test: presignedGetObject(String bucketName, String objectName)"
                             + ", Response: " + response
@@ -619,10 +621,12 @@ public static void presignedGetObject_test2() throws Exception {
         String errorXml = "";
 
         // read entire body stream to string.
-        Scanner scanner = new java.util.Scanner(response.body().charStream()).useDelimiter("\\A");
+        Scanner scanner = new Scanner(response.body().charStream());
+        scanner.useDelimiter("\\A");
         if (scanner.hasNext()) {
           errorXml = scanner.next();
         }
+        scanner.close();
 
         throw new Exception("[FAILED] Test: presignedGetObject(String bucketName, String objectName, Integer expires)"
                             + ", Response: " + response
@@ -680,10 +684,12 @@ public static void presignedGetObject_test3() throws Exception {
         String errorXml = "";
 
         // read entire body stream to string.
-        Scanner scanner = new java.util.Scanner(response.body().charStream()).useDelimiter("\\A");
+        Scanner scanner = new Scanner(response.body().charStream());
+        scanner.useDelimiter("\\A");
         if (scanner.hasNext()) {
           errorXml = scanner.next();
         }
+        scanner.close();
 
         throw new Exception("[FAILED] Test: presignedGetObject(String bucketName, String objectName,"
                             + " Integer expires, Map<String, String> reqParams)"
@@ -729,10 +735,12 @@ public static void presignedPutObject_test1() throws Exception {
         String errorXml = "";
 
         // read entire body stream to string.
-        Scanner scanner = new java.util.Scanner(response.body().charStream()).useDelimiter("\\A");
+        Scanner scanner = new Scanner(response.body().charStream());
+        scanner.useDelimiter("\\A");
         if (scanner.hasNext()) {
           errorXml = scanner.next();
         }
+        scanner.close();
 
         throw new Exception("[FAILED] Test: presignedPutObject(String bucketName, String objectName)"
                             + ", Response: " + response
@@ -768,10 +776,12 @@ public static void presignedPutObject_test2() throws Exception {
         String errorXml = "";
 
         // read entire body stream to string.
-        Scanner scanner = new java.util.Scanner(response.body().charStream()).useDelimiter("\\A");
+        Scanner scanner = new Scanner(response.body().charStream());
+        scanner.useDelimiter("\\A");
         if (scanner.hasNext()) {
           errorXml = scanner.next();
         }
+        scanner.close();
 
         throw new Exception("[FAILED] Test: presignedPutObject(String bucketName, String objectName, Integer expires)"
                             + ", Response: " + response
@@ -813,10 +823,12 @@ public static void presignedPostPolicy_test() throws Exception {
         String errorXml = "";
 
         // read entire body stream to string.
-        Scanner scanner = new java.util.Scanner(response.body().charStream()).useDelimiter("\\A");
+        Scanner scanner = new Scanner(response.body().charStream());
+        scanner.useDelimiter("\\A");
         if (scanner.hasNext()) {
           errorXml = scanner.next();
         }
+        scanner.close();
 
         throw new Exception("[FAILED] Test: presignedPostPolicy(PostPolicy policy)"
                             + ", Response: " + response