summaryrefslogtreecommitdiffstats
path: root/huawei/vnfmadapter
diff options
context:
space:
mode:
authorGao Weitao <victor.gao@huawei.com>2017-09-20 07:49:23 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-20 07:49:23 +0000
commiteaee3ceffd38a09c8b217a7b47dcfdaba2dc5f1c (patch)
treea3aef0f5d840d55ed2e51808d52ce66c921266f0 /huawei/vnfmadapter
parent08046f44be3223e9ae3308abb046da8e9ff7d7d0 (diff)
parentae657813d9409f4326c86324c9a41a391b30bb11 (diff)
Merge "Remove the ConnectTimeoutException"
Diffstat (limited to 'huawei/vnfmadapter')
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslAnonymousSocket.java5
-rw-r--r--huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslCertificateSocket.java19
2 files changed, 12 insertions, 12 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslAnonymousSocket.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslAnonymousSocket.java
index b8b38388..d105e5d4 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslAnonymousSocket.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslAnonymousSocket.java
@@ -23,7 +23,6 @@ import java.security.GeneralSecurityException;
import javax.net.ssl.SSLSocketFactory;
-import org.apache.commons.httpclient.ConnectTimeoutException;
import org.apache.commons.httpclient.params.HttpConnectionParams;
import org.apache.commons.httpclient.protocol.ControllerThreadSocketFactory;
import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
@@ -45,7 +44,7 @@ public class SslAnonymousSocket extends AbstractSslContext implements SecureProt
* <br>
*
* @throws VnfmException
- * @since VFC 1.0
+ * @since VFC 1.0
*/
public void init() throws VnfmException {
try {
@@ -68,7 +67,7 @@ public class SslAnonymousSocket extends AbstractSslContext implements SecureProt
@Override
public Socket createSocket(String host, int port, InetAddress localAddress, int localPort,
- HttpConnectionParams params) throws IOException, ConnectTimeoutException {
+ HttpConnectionParams params) throws IOException {
if(params == null) {
throw new IOException("Illegal socket parameters!");
} else {
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslCertificateSocket.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslCertificateSocket.java
index a525907a..fba805e8 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslCertificateSocket.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/connect/SslCertificateSocket.java
@@ -13,9 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.service.csm.connect;
-import org.apache.commons.httpclient.ConnectTimeoutException;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.security.GeneralSecurityException;
+
+import javax.net.ssl.SSLSocketFactory;
+
import org.apache.commons.httpclient.params.HttpConnectionParams;
import org.apache.commons.httpclient.protocol.ControllerThreadSocketFactory;
import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
@@ -23,12 +30,6 @@ import org.onap.vfc.nfvo.vnfm.svnfm.vnfmadapter.common.VnfmException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.net.ssl.SSLSocketFactory;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.security.GeneralSecurityException;
-
/**
* Created by QuanZhong on 2017/3/6.
*/
@@ -43,7 +44,7 @@ public class SslCertificateSocket extends AbstractSslContext implements SecurePr
* <br>
*
* @throws VnfmException
- * @since VFC 1.0
+ * @since VFC 1.0
*/
public void init() throws VnfmException {
try {
@@ -66,7 +67,7 @@ public class SslCertificateSocket extends AbstractSslContext implements SecurePr
@Override
public Socket createSocket(String host, int port, InetAddress localAddress, int localPort,
- HttpConnectionParams params) throws IOException, ConnectTimeoutException {
+ HttpConnectionParams params) throws IOException {
if(params == null) {
throw new IOException("Illegal socket parameters!");
} else {