From cfe14462a3380c053ad174e0016632e6024e3573 Mon Sep 17 00:00:00 2001 From: Miguel Ferreira Date: Wed, 2 Dec 2015 14:53:56 +0100 Subject: [PATCH] Fix NSX rest client to not reset execution counter after a login --- .../java/com/cloud/network/nicira/NiciraRestClient.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/NiciraRestClient.java b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/NiciraRestClient.java index 6ade3a53777..de58a42607f 100644 --- a/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/NiciraRestClient.java +++ b/plugins/network-elements/nicira-nvp/src/main/java/com/cloud/network/nicira/NiciraRestClient.java @@ -90,7 +90,7 @@ public class NiciraRestClient extends BasicRestClient { if (HttpStatusCodeHelper.isUnauthorized(statusCode)) { return handleUnauthorizedResponse(request, previousStatusCode, response, statusCode); } else if (HttpStatusCodeHelper.isSuccess(statusCode)) { - return handleSuccessResponse(response); + return handleSuccessResponse(request, response); } else { throw new CloudstackRESTException("Unexpecetd status code: " + statusCode); } @@ -110,8 +110,10 @@ public class NiciraRestClient extends BasicRestClient { return execute(request, loginStatusCode); } - private CloseableHttpResponse handleSuccessResponse(final CloseableHttpResponse response) { - counter.resetExecutionCounter(); + private CloseableHttpResponse handleSuccessResponse(final HttpUriRequest request, final CloseableHttpResponse response) { + if (!request.getURI().getPath().contains(loginUrl)) { + counter.resetExecutionCounter(); + } return response; }