garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

we don't need to set the default port manually as wicket does that for us

Browse Source
This commit is contained in:
Athou
2013-08-16 21:33:59 +02:00
parent bf154cf83d
commit 81a4b36c08
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/commafeed/frontend/CommaFeedApplication.java
View File

@@ -114,15 +114,12 @@ public class CommaFeedApplication extends AuthenticatedWebApplication {
return new UrlRenderer(getRequest()) {
@Override
public String renderUrl(Url url) {
// override wicket's relative-to-absolute url conversion with what we know is the correct protocol
String publicUrl = applicationSettingsService.get().getPublicUrl();
if (StringUtils.isNotBlank(publicUrl)) {
Url parsed = Url.parse(publicUrl);
String protocol = parsed.getProtocol();
url.setProtocol(protocol);
Integer port = parsed.getPort();
url.setPort(port != null ? port : StringUtils.equalsIgnoreCase(protocol, "http") ? 80 : 443);
url.setProtocol(parsed.getProtocol());
url.setPort(parsed.getPort());
}
return super.renderUrl(url);
}