summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorluxin <luxin7@huawei.com>2017-09-26 15:53:08 +0800
committerluxin <luxin7@huawei.com>2017-09-26 15:53:08 +0800
commit03d33a66dc1bcff543ef91726d747e987d879710 (patch)
tree8fd9c1c8b5c433a26b7d1028b581052a12826067
parent5348b8226d6cfedc48fa19df2c18e3eefd570ac3 (diff)
Remove Throwable from vfc-svnfm by catch exception
Change-Id: I7c42a7e962f4843244fa6ff75fe71b61d9e6d639 Issue-Id:VFC-391 Signed-off-by: luxin <luxin7@huawei.com>
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtil.java12
1 files changed, 5 insertions, 7 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtil.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtil.java
index cbf8f39c..4d9c91e9 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtil.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/common/ResultRequestUtil.java
@@ -204,10 +204,11 @@ public final class ResultRequestUtil {
/**
* <br>
- *
+ *
+ * @throws VnfmException
* @since VFC 1.0
*/
- private static void removeTokens(String vnfmUrl, String token, String roaRand, String user) {
+ private static void removeTokens(String vnfmUrl, String token, String roaRand, String user) throws VnfmException {
HttpMethod httpMethodToken = null;
String tokenUrl = String.format(ParamConstants.CSM_AUTH_DISCONNECT, user, roaRand);
LOG.info("removeTokens tokenUrl=" + tokenUrl);
@@ -219,8 +220,6 @@ public final class ResultRequestUtil {
LOG.info("removeTokens int=" + statusCode + ", result=" + result);
} catch(IOException e) {
LOG.info(IOEXCEPTION, e);
- } catch(Throwable e) {
- LOG.info(THROWABLE, e);
} finally {
if(httpMethodToken != null) {
httpMethodToken.releaseConnection();
@@ -307,9 +306,10 @@ public final class ResultRequestUtil {
* @param vnfmUrl
* @param token
* @param user
+ * @throws VnfmException
* @since VFC 1.0
*/
- private static void removeV3Tokens(String vnfmUrl, String token, String user) {
+ private static void removeV3Tokens(String vnfmUrl, String token, String user) throws VnfmException {
HttpMethod httpMethodToken = null;
String tokenUrl = String.format(ParamConstants.CSM_AUTH_CONNECT_SOUTH_DISCONNECT, user);
LOG.info("removeTokens tokenUrl=" + tokenUrl);
@@ -321,8 +321,6 @@ public final class ResultRequestUtil {
LOG.info("removeTokens int=" + statusCode + ", result=" + result);
} catch(IOException e) {
LOG.info(IOEXCEPTION, e);
- } catch(Throwable e) {
- LOG.info(THROWABLE, e);
} finally {
if(httpMethodToken != null) {
httpMethodToken.releaseConnection();