Fix createURI for servers without a context path (#43)

labkey-tchad · web-flow · commit a59102b7d4ce · 2022-11-30T11:33:44.000-08:00
diff --git a/labkey-client-api/src/org/labkey/remoteapi/Command.java b/labkey-client-api/src/org/labkey/remoteapi/Command.java
@@ -480,7 +480,9 @@ private URI createURI(Connection connection, String folderPath) throws URISyntax
         if (null != folderPath && folderPath.length() > 0)
         {
             String folderPathNormalized = folderPath.replace('\\', '/');
-            if (folderPathNormalized.charAt(0) != '/' && path.charAt(path.length() - 1) != '/')
+            if (folderPathNormalized.charAt(0) == '/') // strip leading slash
+                folderPathNormalized = folderPathNormalized.substring(1);
+            if (path.charAt(path.length() - 1) != '/')
                 path.append('/');
             path.append(folderPathNormalized);
         }

Original file line number	Diff line number	Diff line change
`@@ -480,7 +480,9 @@ private URI createURI(Connection connection, String folderPath) throws URISyntax`
`480`	`480`	`if (null != folderPath && folderPath.length() > 0)`
`481`	`481`	`{`
`482`	`482`	`String folderPathNormalized = folderPath.replace('\\', '/');`
`483`		`- if (folderPathNormalized.charAt(0) != '/' && path.charAt(path.length() - 1) != '/')`
	`483`	`+ if (folderPathNormalized.charAt(0) == '/') // strip leading slash`
	`484`	`+ folderPathNormalized = folderPathNormalized.substring(1);`
	`485`	`+ if (path.charAt(path.length() - 1) != '/')`
`484`	`486`	`path.append('/');`
`485`	`487`	`path.append(folderPathNormalized);`
`486`	`488`	`}`