From 532ae2f11b7f6302d89da123716387f4ef0644af Mon Sep 17 00:00:00 2001 From: scmerger Date: Mon, 29 Jun 2009 21:41:36 +0000 Subject: [PATCH] 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. --- .../impl/protocol/sip/SipRegistrarConnection.java | 2 +- .../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 746492bfb..986474aed 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 @@ else if (response.getStatusCode() == Response.FORBIDDEN) 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 cc401d2ad..eee7d9be4 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 @@ private CredentialsCacheEntry createCcEntryWithNewCredentials( 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(