gCubeSystem
/
resource-registry-handlers
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed changed APIs 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/Common/resource-registry-handlers@176668 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2019-01-17 16:00:45 +00:00
parent 87bada77ca
commit 82413a9dfe
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/gcube/smartgears/handler/resourceregistry/EServiceManager.java
View File

@ -469,15 +469,15 @@ public class EServiceManager extends ApplicationLifecycleHandler {
ContainerConfiguration container = context.container().configuration();
String baseAddress;
if (configuration.proxied()){
String protocol = container.proxyAddress().secure()? "https://": "http://";
int port = container.proxyAddress().port();
String protocol = configuration.proxyAddress().protocol();
String port = configuration.proxyAddress().port()!=null?":"+configuration.proxyAddress().port():"";
baseAddress=String.format("%s%s:%d%s", protocol , container.proxyAddress().hostname(), port, context.application().getContextPath());
baseAddress=String.format("%s://%s%s%s", protocol , configuration.proxyAddress().hostname(), port,context.application().getContextPath());
} else {
String protocol = configuration.secure()? "https://": "http://";
int port = configuration.secure()?container.securePort(): container.port();
String protocol = container.protocol();
int port = container.port();
baseAddress=String.format("%s%s:%d%s", protocol , container.hostname(), port, context.application().getContextPath());
baseAddress=String.format("%s://%s:%d%s", protocol , container.hostname(), port,context.application().getContextPath());
}
return baseAddress;
}