Code Review
/
aai
/
rest-client.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix bugs in Rest Client
[aai/rest-client.git]
/
src
/
main
/
java
/
org
/
onap
/
aai
/
restclient
/
client
/
RestClient.java
diff --git
a/src/main/java/org/onap/aai/restclient/client/RestClient.java
b/src/main/java/org/onap/aai/restclient/client/RestClient.java
index
a00c0ef
..
f4f184c
100644
(file)
--- a/
src/main/java/org/onap/aai/restclient/client/RestClient.java
+++ b/
src/main/java/org/onap/aai/restclient/client/RestClient.java
@@
-32,6
+32,7
@@
import java.util.concurrent.ConcurrentMap;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.MultivaluedHashMap;
import javax.ws.rs.core.Response;
import org.onap.aai.restclient.enums.RestAuthenticationMode;
import javax.ws.rs.core.Response;
import org.onap.aai.restclient.enums.RestAuthenticationMode;
@@
-319,6
+320,7
@@
public class RestClient {
} catch (InterruptedException e) {
logger.error(RestClientMsgs.HTTP_REQUEST_INTERRUPTED, url, e.getLocalizedMessage());
} catch (InterruptedException e) {
logger.error(RestClientMsgs.HTTP_REQUEST_INTERRUPTED, url, e.getLocalizedMessage());
+ Thread.currentThread().interrupt();
break;
}
}
break;
}
}
@@
-381,7
+383,9
@@
public class RestClient {
populateOperationResult(clientResponse, operationResult);
// Debug log the response
populateOperationResult(clientResponse, operationResult);
// Debug log the response
- debugResponse(operationResult, clientResponse.getHeaders());
+ if (clientResponse != null) {
+ debugResponse(operationResult, clientResponse.getHeaders());
+ }
} catch (Exception ex) {
} catch (Exception ex) {