Skip to content

Commit

Permalink
Merge pull request #66 from at88mph/SP-3544
Browse files Browse the repository at this point in the history
Sp 3544
  • Loading branch information
at88mph authored Jun 14, 2024
2 parents 4597eff + 159baac commit 963ce29
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 5 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ repositories {
dependencies {
implementation 'com.opencsv:opencsv:[5.1,6.0)'
implementation 'commons-net:commons-net:3.9.0'
implementation 'org.apache.commons:commons-configuration2:2.8.0'
implementation 'org.apache.commons:commons-configuration2:2.10.1'
implementation 'org.opencadc:cadc-access-control-identity:[1.1.0,)'
implementation 'org.opencadc:cadc-gms:[1.0.12,2.0)'
implementation 'org.opencadc:cadc-log:[1.1.5,)'
implementation 'org.opencadc:cadc-rest:[1.3.9,)'
implementation 'org.opencadc:cadc-util:[1.6,)'
implementation 'org.opencadc:cadc-web-token:[1.1.0,2.0.0)'
implementation 'org.opencadc:cadc-web-token:[1.1.1,2.0.0)'

runtimeOnly 'javax.servlet.jsp.jstl:jstl-api:1.2'
runtimeOnly 'javax.servlet:jstl:1.2'
Expand Down
13 changes: 10 additions & 3 deletions src/main/java/org/opencadc/scienceportal/session/GetAction.java
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,19 @@ public class GetAction extends SciencePortalAuthGetAction {
@Override
protected String getEndpoint() {
final String path = this.syncInput.getPath();
final StringBuilder stringBuilder = new StringBuilder();
stringBuilder.append(GetAction.SESSION_ENDPOINT);

if (StringUtil.hasText(path)) {
final String trimPath = path.trim();
return GetAction.SESSION_ENDPOINT + (trimPath.startsWith("/") ? path : "/" + path);
} else {
return GetAction.SESSION_ENDPOINT;
if (!trimPath.startsWith("/")) {
stringBuilder.append("/");
}

stringBuilder.append(trimPath);
}

return stringBuilder.toString();
}

@Override
Expand Down

0 comments on commit 963ce29

Please sign in to comment.