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.
cusax-fix
scmerger 17 years ago
parent b24a837947
commit 532ae2f11b

@ -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.");

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

Loading…
Cancel
Save