Swiftdiff options
| author | Alex Clayton <alex.clayton@isode.com> | 2016-01-14 11:28:44 (GMT) |
|---|---|---|
| committer | Alex Clayton <alex.clayton@isode.com> | 2016-01-14 13:47:59 (GMT) |
| commit | c72128ba30a386704244322c15146a1b4a609a12 (patch) | |
| tree | ec6ccc82b6e36467736feb20033cc888eceea57a /src/com/isode/stroke/network/EnvironmentProxyProvider.java | |
| parent | b4cf2bb8d7b69d95b4a10d610ad259998d2aee5b (diff) | |
| download | stroke-c72128ba30a386704244322c15146a1b4a609a12.zip stroke-c72128ba30a386704244322c15146a1b4a609a12.tar.bz2 | |
More Changes to Networks
Some more changes to the Networks classes. Based on comments on the last
patch.
Test-information:
No longer see crash I was seeing when I ran the updated Stroke against MLC.
Ran unit tests.
Change-Id: Id577e5322bab0ec48f0353907f82e72bc93b848a
Diffstat (limited to 'src/com/isode/stroke/network/EnvironmentProxyProvider.java')
| -rw-r--r-- | src/com/isode/stroke/network/EnvironmentProxyProvider.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/com/isode/stroke/network/EnvironmentProxyProvider.java b/src/com/isode/stroke/network/EnvironmentProxyProvider.java index b12fe98..b36d567 100644 --- a/src/com/isode/stroke/network/EnvironmentProxyProvider.java +++ b/src/com/isode/stroke/network/EnvironmentProxyProvider.java @@ -43,9 +43,13 @@ public class EnvironmentProxyProvider implements ProxyProvider { proxyProtocol += "://"; address = envVar != null ? envVar : "0.0.0.0"; - if(envVar != null && address.substring(0, proxyProtocol.length()).equals(proxyProtocol)) { + if(envVar != null && address.startsWith(proxyProtocol)) { address = address.substring(proxyProtocol.length(), address.length()); - port = Integer.parseInt(address.substring(address.indexOf(':') + 1, address.length())); + try { + port = Integer.parseInt(address.substring(address.indexOf(':') + 1, address.length())); + } catch (NumberFormatException e) { + port = 0; + } address = address.substring(0, address.indexOf(':')); } |