summaryrefslogtreecommitdiffstats
path: root/adapters/mso-vfc-adapter/src
diff options
context:
space:
mode:
authorRob Daugherty <rd472p@att.com>2018-03-07 18:45:32 +0000
committerGerrit Code Review <gerrit@onap.org>2018-03-07 18:45:32 +0000
commit4fb6ea33d4dc04730c171f55cedfe62b56ac5484 (patch)
treefa2d0257f12e334b9fd8a5ed83efb5f9f83752de /adapters/mso-vfc-adapter/src
parent61b1d1cdd962f95015add112c54c25a7f998079c (diff)
parent8a6c06a549e753cbac8341aef3e23f2f4b4f3fe2 (diff)
Merge "Remove redundant catch clause"
Diffstat (limited to 'adapters/mso-vfc-adapter/src')
-rw-r--r--adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java
index afee1bbfaa..fcbbf8515a 100644
--- a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java
+++ b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java
@@ -166,12 +166,7 @@ public class RestfulUtil {
method = null;
return createResponse(statusCode, responseContent);
- } catch(SocketTimeoutException e) {
- String errMsg = "Request to VFC timed out";
- logError(errMsg, e);
- return createResponse(HttpURLConnection.HTTP_CLIENT_TIMEOUT, errMsg);
-
- } catch(ConnectTimeoutException e) {
+ } catch(SocketTimeoutException | ConnectTimeoutException e) {
String errMsg = "Request to VFC timed out";
logError(errMsg, e);
return createResponse(HttpURLConnection.HTTP_CLIENT_TIMEOUT, errMsg);