Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-09 15:05:44 +01:00
Code Issues Packages Projects Releases Activity

improve error handling

Browse Source
This commit is contained in:
Sebastian Sdorra
2011-05-11 08:43:54 +02:00
parent 109b3325bb
commit 08f2ab49be
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
scm-clients/scm-client-impl/src/main/java/sonia/scm/client/JerseyClientProvider.java
View File

@@ -86,15 +86,15 @@ public class JerseyClientProvider implements ScmClientProvider
{
AssertUtil.assertIsNotEmpty(url);
String user = "anonymous";
if (Util.isNotEmpty(username))
{
user = username;
}
if (logger.isInfoEnabled())
{
String user = "anonymous";
if (Util.isNotEmpty(username))
{
user = username;
}
logger.info("create new session for {} with username {}", url, user);
}
@@ -128,14 +128,23 @@ public class JerseyClientProvider implements ScmClientProvider
response = resource.get(ClientResponse.class);
}
if (response.getStatus() == 401)
if (response.getStatus() != 200)
{
String msg =
"server returned ".concat(String.valueOf(response.getStatus()));
if (logger.isWarnEnabled())
{
logger.warn("server returned 401 unauthorized");
logger.warn(msg);
}
throw new UnauthorizedAccessException();
if (logger.isTraceEnabled())
{
logger.trace("server returned content: {}",
response.getEntity(String.class));
}
throw new ScmClientException(msg);
}
ScmState state = response.getEntity(ScmState.class);
@@ -149,6 +158,10 @@ public class JerseyClientProvider implements ScmClientProvider
throw new ScmClientException("create ScmClientSession failed");
}
else if (logger.isInfoEnabled())
{
logger.info("create session successfully for user {}", user);
}
return new JerseyClientSession(client, urlProvider, state);
}