Remove timeout validation, fixes rabbitmq#92

michaelklishin · michaelklishin · commit 474121e0e9a1 · 2015-09-22T13:56:52.000+03:00
diff --git a/src/com/rabbitmq/client/ConnectionFactory.java b/src/com/rabbitmq/client/ConnectionFactory.java
@@ -321,11 +321,7 @@ public void setConnectionTimeout(int timeout) {
         if(timeout < 0) {
             throw new IllegalArgumentException("TCP connection timeout cannot be negative");
         }
-        if(timeout > handshakeTimeout) {
-            throw new IllegalArgumentException("TCP connection timeout cannot be greater than handshake timeout");
-        } else {
-            this.connectionTimeout = timeout;
-        }
+        this.connectionTimeout = timeout;
     }
 
     /**
@@ -352,11 +348,7 @@ public void setHandshakeTimeout(int timeout) {
         if(timeout < 0) {
             throw new IllegalArgumentException("handshake timeout cannot be negative");
         }
-        if(connectionTimeout != 0 && timeout < connectionTimeout) {
-            throw new IllegalArgumentException("handshake timeout cannot be lower than TCP connection timeout");
-        } else {
-            this.handshakeTimeout = timeout;
-        }
+        this.handshakeTimeout = timeout;
     }
 
     /**
@@ -561,8 +553,7 @@ public void useSslProtocol(String protocol, TrustManager trustManager)
      *
      * @param context An initialized SSLContext
      */
-    public void useSslProtocol(SSLContext context)
-    {
+    public void useSslProtocol(SSLContext context) {
         setSocketFactory(context.getSocketFactory());
     }
 
diff --git a/test/src/com/rabbitmq/client/test/AMQConnectionTest.java b/test/src/com/rabbitmq/client/test/AMQConnectionTest.java
@@ -106,13 +106,8 @@ public void testNegativeProtocolHandshakeTimeout() {
 
     public void testTCPConnectionTimeoutGreaterThanHandShakeTimeout() {
         ConnectionFactory cf = new ConnectionFactory();
-        try {
-            cf.setHandshakeTimeout(3000);
-            cf.setConnectionTimeout(5000);
-            fail("expected an exception");
-        } catch (IllegalArgumentException _ignored) {
-            // expected
-        }
+        cf.setHandshakeTimeout(3000);
+        cf.setConnectionTimeout(5000);
     }
 
     public void testProtocolHandshakeTimeoutGreaterThanTCPConnectionTimeout() {

Original file line number	Diff line number	Diff line change
`@@ -321,11 +321,7 @@ public void setConnectionTimeout(int timeout) {`
`321`	`321`	`if(timeout < 0) {`
`322`	`322`	`throw new IllegalArgumentException("TCP connection timeout cannot be negative");`
`323`	`323`	`}`
`324`		`- if(timeout > handshakeTimeout) {`
`325`		`- throw new IllegalArgumentException("TCP connection timeout cannot be greater than handshake timeout");`
`326`		`- } else {`
`327`		`- this.connectionTimeout = timeout;`
`328`		`- }`
	`324`	`+ this.connectionTimeout = timeout;`
`329`	`325`	`}`
`330`	`326`
`331`	`327`	`/**`
`@@ -352,11 +348,7 @@ public void setHandshakeTimeout(int timeout) {`
`352`	`348`	`if(timeout < 0) {`
`353`	`349`	`throw new IllegalArgumentException("handshake timeout cannot be negative");`
`354`	`350`	`}`
`355`		`- if(connectionTimeout != 0 && timeout < connectionTimeout) {`
`356`		`- throw new IllegalArgumentException("handshake timeout cannot be lower than TCP connection timeout");`
`357`		`- } else {`
`358`		`- this.handshakeTimeout = timeout;`
`359`		`- }`
	`351`	`+ this.handshakeTimeout = timeout;`
`360`	`352`	`}`
`361`	`353`
`362`	`354`	`/**`
`@@ -561,8 +553,7 @@ public void useSslProtocol(String protocol, TrustManager trustManager)`
`561`	`553`	`*`
`562`	`554`	`* @param context An initialized SSLContext`
`563`	`555`	`*/`
`564`		`- public void useSslProtocol(SSLContext context)`
`565`		`- {`
	`556`	`+ public void useSslProtocol(SSLContext context) {`
`566`	`557`	`setSocketFactory(context.getSocketFactory());`
`567`	`558`	`}`
`568`	`559`