diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2011-04-07 12:31:02 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2011-04-07 12:31:12 -0700 |
| commit | 7a8671bc57b163ae8950a1876a4707c33790904b (patch) | |
| tree | 720eabd5fd655f22f8ed28f38879585b477afb89 | |
| parent | 4794d8f3a9318e063cd08501ddf66fa767af0c19 (diff) | |
| parent | a58e4068f86c6ca3f9771d4ec8b2665d070a170e (diff) | |
| download | platform_external_nist-sip-7a8671bc57b163ae8950a1876a4707c33790904b.tar.gz platform_external_nist-sip-7a8671bc57b163ae8950a1876a4707c33790904b.tar.bz2 platform_external_nist-sip-7a8671bc57b163ae8950a1876a4707c33790904b.zip | |
Merge from gingerbread
Change-Id: Ic33eb4a67fdf638f2ba192d60b6a8cf6f9c72be7
| -rw-r--r-- | java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java b/java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java index aa29616..4dc39ef 100644 --- a/java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java +++ b/java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java @@ -212,7 +212,8 @@ public class AuthenticationHelperImpl implements AuthenticationHelper { Hop hop = ((SIPClientTransaction) challengedTransaction).getNextHop(); SipURI sipUri = (SipURI) reoriginatedRequest.getRequestURI(); // BEGIN android-added - if ( !hop.getHost().equalsIgnoreCase(sipUri.getHost()) ) + if ( !hop.getHost().equalsIgnoreCase(sipUri.getHost()) + && !hop.equals(sipStack.getRouter(challengedRequest).getOutboundProxy()) ) // END android-added sipUri.setMAddrParam(hop.getHost()); if ( hop.getPort() != -1 ) sipUri.setPort(hop.getPort()); |