commit 3ff4b4d623bfb41ec47eea0c87c9aa9bbb9843db
author Jean-Baptiste Queru <jbq@google.com> Mon Apr 11 17:32:47 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Apr 11 17:32:47 2011 -0700
tree 6801343a8962a5df732a0ef2b8857c7c4d0d894c
parent db531d33d5fbac8e02d3b7b9568a64da393fe806
parent 7a8671bc57b163ae8950a1876a4707c33790904b

am 7a8671bc: Merge from gingerbread

* commit '7a8671bc57b163ae8950a1876a4707c33790904b':
  Fix the maddr issue for proxy authentication.

java/gov/nist/javax/sip/clientauthutils/AuthenticationHelperImpl.java

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 @@
                 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());