diff options
| author | scmerger <scmerger@java.net> | 2009-06-29 21:41:36 +0000 |
|---|---|---|
| committer | scmerger <scmerger@java.net> | 2009-06-29 21:41:36 +0000 |
| commit | 532ae2f11b7f6302d89da123716387f4ef0644af (patch) | |
| tree | 86d62e29003ff97030ba8bb5046386e9081381c5 /src/net/java | |
| parent | b24a83794784fe0d2cab415fa4eec5a4cbd1e956 (diff) | |
| download | jitsi-532ae2f11b7f6302d89da123716387f4ef0644af.zip jitsi-532ae2f11b7f6302d89da123716387f4ef0644af.tar.gz jitsi-532ae2f11b7f6302d89da123716387f4ef0644af.tar.bz2 | |
Merge branch '1.0-local' into trunk-local
* 1.0-local:
Make sure that all errors that occur during registration are reported.
Fixes problem authentication problem for first authentications.
Diffstat (limited to 'src/net/java')
| -rw-r--r-- | src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java | 2 | ||||
| -rw-r--r-- | src/net/java/sip/communicator/impl/protocol/sip/security/SipSecurityManager.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java b/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java index 746492b..986474a 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/SipRegistrarConnection.java @@ -951,7 +951,7 @@ public class SipRegistrarConnection processed = true; } //errors - else if ( response.getStatusCode() / 100 == 4 ) + else if ( response.getStatusCode() >= 400 ) { logger.error("Received an error response."); diff --git a/src/net/java/sip/communicator/impl/protocol/sip/security/SipSecurityManager.java b/src/net/java/sip/communicator/impl/protocol/sip/security/SipSecurityManager.java index cc401d2..eee7d9b 100644 --- a/src/net/java/sip/communicator/impl/protocol/sip/security/SipSecurityManager.java +++ b/src/net/java/sip/communicator/impl/protocol/sip/security/SipSecurityManager.java @@ -500,9 +500,9 @@ public class SipSecurityManager String authName = accountID.getAccountPropertyString( ProtocolProviderFactory.AUTHORIZATION_NAME); if(authName != null && authName.length() > 0) - ccEntry.userCredentials.setUserName(authName); + defaultCredentials.setUserName(authName); else - ccEntry.userCredentials.setUserName(accountID.getUserID()); + defaultCredentials.setUserName(accountID.getUserID()); UserCredentials newCredentials = getSecurityAuthority().obtainCredentials( |