Merge "Bug fix of some reports not uploaded"

1 files changed, 18 insertions, 3 deletions

diff --git a/src/main/java/com/android/vts/servlet/ShowGcsLogServlet.java b/src/main/java/com/android/vts/servlet/ShowGcsLogServlet.java
index f9b6f85..82624ce 100644
--- a/src/main/java/com/android/vts/servlet/ShowGcsLogServlet.java
+++ b/src/main/java/com/android/vts/servlet/ShowGcsLogServlet.java
@@ -35,6 +35,7 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
@@ -78,7 +79,8 @@ public class ShowGcsLogServlet extends BaseServlet {
     public void init(ServletConfig cfg) throws ServletException {
         super.init(cfg);
 
-        this.keyFileInputStream = this.getClass().getClassLoader().getResourceAsStream("keys/" + GCS_KEY_FILE);
+        this.keyFileInputStream =
+                this.getClass().getClassLoader().getResourceAsStream("keys/" + GCS_KEY_FILE);
 
         Optional<Storage> optionalStorage = GcsHelper.getStorage(this.keyFileInputStream);
         if (optionalStorage.isPresent()) {
@@ -215,15 +217,17 @@ public class ShowGcsLogServlet extends BaseServlet {
             if (pathInfo.getNameCount() == 0) {
                 listOptions = new BlobListOption[] {BlobListOption.currentDirectory()};
             } else {
+                String prefixPathString = path.endsWith("/") ? path : path.concat("/");
                 if (pathInfo.getNameCount() <= 1) {
                     dirList.add("/");
                 } else {
-                    dirList.add(pathInfo.getParent().toString());
+                    dirList.add(getParentDirPath(prefixPathString));
                 }
+
                 listOptions =
                         new BlobListOption[] {
                             BlobListOption.currentDirectory(),
-                            BlobListOption.prefix(pathInfo.toString() + "/")
+                            BlobListOption.prefix(prefixPathString)
                         };
             }
 
@@ -254,4 +258,15 @@ public class ShowGcsLogServlet extends BaseServlet {
             }
         }
     }
+
+    private String getParentDirPath(String fileOrDirPath) {
+        boolean endsWithSlashCheck = fileOrDirPath.endsWith(File.separator);
+        return fileOrDirPath.substring(
+                0,
+                fileOrDirPath.lastIndexOf(
+                        File.separatorChar,
+                        endsWithSlashCheck
+                                ? fileOrDirPath.length() - 2
+                                : fileOrDirPath.length() - 1));
+    }
 }