Applied patch 100541 for bug 232159v20080515-2108

2 files changed, 1 insertions, 102 deletions

diff --git a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFSSLSocket.java b/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFSSLSocket.java
deleted file mode 100644
index 8d652c0d7..000000000
--- a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFSSLSocket.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c)2008 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- * 
- * Contributors:
- *     IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.ecf.internal.ssl;
-
-import java.io.IOException;
-import java.net.Socket;
-
-import javax.net.ssl.HandshakeCompletedListener;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.SSLSocket;
-
-public class ECFSSLSocket extends SSLSocket {
-	
-	private SSLSocket sslSocket;
-	
-	public ECFSSLSocket(Socket socket) {
-		this.sslSocket = (SSLSocket) socket;
-	}
-	
-	public void addHandshakeCompletedListener(HandshakeCompletedListener arg0) {
-		sslSocket.addHandshakeCompletedListener(arg0);
-	}
-
-	public boolean getEnableSessionCreation() {
-		return sslSocket.getEnableSessionCreation();
-	}
-
-	public String[] getEnabledCipherSuites() {
-		return sslSocket.getEnabledCipherSuites();
-	}
-
-	public String[] getEnabledProtocols() {
-		return sslSocket.getEnabledProtocols();
-	}
-
-	public boolean getNeedClientAuth() {
-		return sslSocket.getNeedClientAuth();
-	}
-
-	public SSLSession getSession() {
-		return sslSocket.getSession();
-	}
-
-	public String[] getSupportedCipherSuites() {
-		return sslSocket.getSupportedCipherSuites();
-	}
-
-	public String[] getSupportedProtocols() {
-		return sslSocket.getSupportedProtocols();
-	}
-
-	public boolean getUseClientMode() {
-		return sslSocket.getUseClientMode();
-	}
-
-	public boolean getWantClientAuth() {
-		return sslSocket.getWantClientAuth();
-	}
-
-	public void removeHandshakeCompletedListener(HandshakeCompletedListener arg0) {
-		sslSocket.removeHandshakeCompletedListener(arg0);
-	}
-
-	public void setEnableSessionCreation(boolean arg0) {
-		sslSocket.setEnableSessionCreation(arg0);
-	}
-
-	public void setEnabledCipherSuites(String[] arg0) {
-		sslSocket.setEnabledCipherSuites(arg0);
-	}
-
-	public void setEnabledProtocols(String[] arg0) {
-		sslSocket.setEnabledProtocols(arg0);
-	}
-
-	public void setNeedClientAuth(boolean arg0) {
-		sslSocket.setNeedClientAuth(arg0);
-	}
-
-	public void setUseClientMode(boolean arg0) {
-		sslSocket.setUseClientMode(arg0);
-	}
-
-	public void setWantClientAuth(boolean arg0) {
-		sslSocket.setWantClientAuth(arg0);
-	}
-
-	public void startHandshake() throws IOException {
-		sslSocket.startHandshake();		
-		// could catch the CertificateException here...
-	}
-
-}
\ No newline at end of file
diff --git a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFSSLSocketFactory.java b/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFSSLSocketFactory.java
index c1356ab79..e9208abb6 100644
--- a/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFSSLSocketFactory.java
+++ b/framework/bundles/org.eclipse.ecf.ssl/src/org/eclipse/ecf/internal/ssl/ECFSSLSocketFactory.java
@@ -34,7 +34,7 @@ public class ECFSSLSocketFactory extends SSLSocketFactory {
 	}
 
 	public Socket createSocket(Socket socket, String host, int port, boolean autoClose) throws IOException {
-		return new ECFSSLSocket(getSSLSocketFactory().createSocket(socket, host, port, autoClose));
+		return getSSLSocketFactory().createSocket(socket, host, port, autoClose);
 	}
 
 	public String[] getDefaultCipherSuites() {