summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWiktor Garbarek <wiktor.garbarek@nokia.com>2018-07-03 15:53:48 +0200
committerWiktor Garbarek <wiktor.garbarek@nokia.com>2018-07-03 15:57:53 +0200
commit6d1ca7d232210e9477a6c6040317738eb63dd809 (patch)
treebae05e3b25fe29be7e223c6c743f8ecf2dbf0797
parent95207ef6f7006afca1b23d9ad72ccf2daa7e250e (diff)
Fix bugs in Rest Client
Fixed handling InterruptedException and NullPointerException Change-Id: I4a7f0d73394bc8c7cbdce5bc424104edcc036fe4 Issue-ID: AAI-1359 Signed-off-by: Wiktor Garbarek <wiktor.garbarek@nokia.com>
-rw-r--r--pom.xml9
-rw-r--r--src/main/java/org/onap/aai/restclient/client/RestClient.java6
2 files changed, 12 insertions, 3 deletions
diff --git a/pom.xml b/pom.xml
index b469d68..3ed13c3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,9 +90,14 @@ limitations under the License.
<artifactId>powermock-module-junit4-rule-agent</artifactId>
<version>1.6.2</version>
<scope>test</scope>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>2.0</version>
+ </dependency>
- </dependencies>
+ </dependencies>
<build>
<pluginManagement>
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
--- 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.MultivaluedHashMap;
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());
+ Thread.currentThread().interrupt();
break;
}
}
@@ -381,7 +383,9 @@ public class RestClient {
populateOperationResult(clientResponse, operationResult);
// Debug log the response
- debugResponse(operationResult, clientResponse.getHeaders());
+ if (clientResponse != null) {
+ debugResponse(operationResult, clientResponse.getHeaders());
+ }
} catch (Exception ex) {