Merge branch 'stable-3.3'
* stable-3.3: Ensure that stored credentials aren't reset too early Change-Id: Idcd57e12f5fe905952be49edb4f82db6b7ed469f Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
This commit is contained in:
commit
7388955319
|
@ -472,13 +472,13 @@ private HttpConnection connect(final String service)
|
||||||
throw new TransportException(uri, MessageFormat.format(
|
throw new TransportException(uri, MessageFormat.format(
|
||||||
JGitText.get().authenticationNotSupported, uri));
|
JGitText.get().authenticationNotSupported, uri));
|
||||||
CredentialsProvider credentialsProvider = getCredentialsProvider();
|
CredentialsProvider credentialsProvider = getCredentialsProvider();
|
||||||
|
if (authAttempts > 1)
|
||||||
|
credentialsProvider.reset(uri);
|
||||||
if (3 < authAttempts
|
if (3 < authAttempts
|
||||||
|| !authMethod.authorize(uri, credentialsProvider)) {
|
|| !authMethod.authorize(uri, credentialsProvider)) {
|
||||||
credentialsProvider.reset(uri);
|
|
||||||
throw new TransportException(uri,
|
throw new TransportException(uri,
|
||||||
JGitText.get().notAuthorized);
|
JGitText.get().notAuthorized);
|
||||||
}
|
}
|
||||||
credentialsProvider.reset(uri);
|
|
||||||
authAttempts++;
|
authAttempts++;
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue