Extended to can be used with apache commons httpclient 3.1

git-svn-id: https://joinup.ec.europa.eu/svn/moa-idspss/trunk@1048 d688527b-c9ab-4aba-bd8d-4036d912da1d

2 files changed, 30 insertions, 1 deletions

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 42031279d..df4d888cd 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -120,7 +120,6 @@
 		<dependency>

 			<groupId>commons-httpclient</groupId>

 			<artifactId>commons-httpclient</artifactId>

-			<version>2.0.2</version>

 		</dependency>

 		<dependency>

 			<groupId>at.gv.egovernment.moa.id</groupId>

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWSecureSocketFactory.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWSecureSocketFactory.java
index 41a07d146..de839feba 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWSecureSocketFactory.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/parep/client/szrgw/SZRGWSecureSocketFactory.java
@@ -4,7 +4,10 @@ import java.io.IOException;
 import java.net.InetAddress;

 import java.net.Socket;

 import java.net.UnknownHostException;

+

 import javax.net.ssl.SSLSocketFactory;

+

+import org.apache.commons.httpclient.params.HttpConnectionParams;

 import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;

 

 

@@ -77,6 +80,32 @@ public class SZRGWSecureSocketFactory implements SecureProtocolSocketFactory {
           autoClose

       );

   }

+  

+  /**

+   * @see SecureProtocolSocketFactory#createSocket(java.lang.String,int,java.net.InetAddress,int,org.apache.commons.httpclient.params.HttpConnectionParams)

+   */

+  public Socket createSocket(

+      String host,

+      int port,

+      InetAddress clientHost,

+      int clientPort,

+      HttpConnectionParams params)

+      throws IOException, UnknownHostException, org.apache.commons.httpclient.ConnectTimeoutException {

+

+      Socket socket = createSocket(host, port, clientHost, clientPort);

+      if (socket != null) {

+          // socket.setKeepAlive(false);

+          if (params.getReceiveBufferSize() >= 0)

+              socket.setReceiveBufferSize(params.getReceiveBufferSize());

+          if (params.getSendBufferSize() >= 0)

+              socket.setSendBufferSize(params.getSendBufferSize());

+          socket.setReuseAddress(true);

+          if (params.getSoTimeout() >= 0)

+              socket.setSoTimeout(params.getSoTimeout());

+      }

+      return socket;

+    

+  }

 

   /**

    * @see java.lang.Object#equals(java.lang.Object)

@@ -91,4 +120,5 @@ public class SZRGWSecureSocketFactory implements SecureProtocolSocketFactory {
   public int hashCode() {

       return SZRGWSecureSocketFactory.class.hashCode();

   }

+  

 }