Update of /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32574/src/org/sblim/cimclient/internal/wbem
Modified Files:
Tag: Experimental
WBEMClientCIMXML.java
Log Message:
2662 Need the specific SSLHandshakeException during the cim call
Index: WBEMClientCIMXML.java
===================================================================
RCS file: /cvsroot/sblim/jsr48-client/src/org/sblim/cimclient/internal/wbem/WBEMClientCIMXML.java,v
retrieving revision 1.21.2.76
retrieving revision 1.21.2.77
diff -u -d -r1.21.2.76 -r1.21.2.77
--- WBEMClientCIMXML.java 31 Jul 2013 14:19:22 -0000 1.21.2.76
+++ WBEMClientCIMXML.java 10 Sep 2013 15:51:27 -0000 1.21.2.77
@@ -73,6 +73,7 @@
* 2614 2013-02-21 blaschke-oss Remove redundant code in transmitRequest
* 2616 2013-02-23 blaschke-oss Add new API WBEMClientSBLIM.sendIndication()
* 2651 2013-07-31 blaschke-oss IOException when tracing the cimxml
+ * 2662 2013-09-10 blaschke-oss Need the specific SSLHandshakeException during the cim call
*/
package org.sblim.cimclient.internal.wbem;
@@ -109,6 +110,7 @@
import javax.cim.UnsignedInteger32;
import javax.cim.UnsignedInteger64;
import javax.net.SocketFactory;
+import javax.net.ssl.SSLHandshakeException;
import javax.security.auth.Subject;
import javax.wbem.CloseableIterator;
import javax.wbem.WBEMException;
@@ -1723,6 +1725,9 @@
throw new WBEMException(WBEMException.CIM_ERR_FAILED, "Unknown host", null, e);
} catch (SocketException e) {
throw new WBEMException(WBEMException.CIM_ERR_FAILED, "Unable to connect", null, e);
+ } catch (SSLHandshakeException e) {
+ throw new WBEMException(WBEMException.CIM_ERR_FAILED, "SSL handshake exception",
+ null, e);
}
OutputStream os = connection.getOutputStream();
@@ -1752,6 +1757,10 @@
connection.disconnect();
throw new WBEMException(WBEMException.CIM_ERR_FAILED, "Connection timed out", null,
e);
+ } catch (SSLHandshakeException e) {
+ connection.disconnect();
+ throw new WBEMException(WBEMException.CIM_ERR_FAILED, "SSL handshake exception",
+ null, e);
}
HttpHeader headers = parseHeaders(connection);
|
