Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-02 12:49:11 +01:00
Code Issues Packages Projects Releases Activity

fix bug in HttpUtil.getPortFromUrl method

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-07-08 20:51:15 +02:00
parent 85710771c8
commit 5a1dacb70b
1 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
scm-core/src/main/java/sonia/scm/util/HttpUtil.java
View File

@@ -96,6 +96,12 @@ public class HttpUtil
*/
public static final char SEPARATOR_PORT = ':';
/**
* Url scheme separator
* @since 1.5
*/
public static final String SEPARATOR_SCHEME = "://";
/** Field description */
public static final String STATUS_UNAUTHORIZED_MESSAGE =
"Authorization Required";
@@ -159,31 +165,38 @@ public class HttpUtil
AssertUtil.assertIsNotEmpty(url);
int port = PORT_HTTP;
int index = url.indexOf(SEPARATOR_PORT);
int schemeIndex = url.indexOf(SEPARATOR_SCHEME);
if (index > 0)
if (schemeIndex > 0)
{
String portString = url.substring(index);
int slIndex = portString.indexOf(SEPARATOR_FOLDER);
String urlWithoutScheme = url.substring(schemeIndex
+ SEPARATOR_SCHEME.length());
int portIndex = urlWithoutScheme.lastIndexOf(SEPARATOR_PORT);
if (slIndex > 0)
if (portIndex > 0)
{
portString = portString.substring(0, slIndex);
}
String portString = urlWithoutScheme.substring(portIndex + 1);
int slIndex = portString.indexOf(SEPARATOR_FOLDER);
try
{
port = Integer.parseInt(portString);
if (slIndex > 0)
{
portString = portString.substring(0, slIndex);
}
try
{
port = Integer.parseInt(portString);
}
catch (NumberFormatException ex)
{
logger.error("could not parse port part of url", ex);
}
}
catch (NumberFormatException ex)
else if (url.startsWith(SCHEME_HTTPS))
{
logger.error("could not parse port part of url", ex);
port = PORT_HTTPS;
}
}
else if (url.startsWith(SCHEME_HTTPS))
{
port = PORT_HTTPS;
}
return port;
}