[java-identity-provider COMMIT] in /trunk/idp-cas-impl/src: main/java/net/shibboleth/idp/cas/proxy/impl/HttpClientPro...

[noreply at shibboleth.net]

Author: tzeller
Date: Sun Mar 13 14:52:35 2016
New Revision: 8152

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8152&view=rev
Log:
Attempt to fix test on Windows and fix setter constraint.

Modified:
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/proxy/impl/HttpClientProxyAuthenticator.java
    trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/proxy/impl/HttpClientProxyAuthenticatorTest.java

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/proxy/impl/HttpClientProxyAuthenticator.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/proxy/impl/HttpClientProxyAuthenticator.java?rev=8152&r1=8151&r2=8152&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/proxy/impl/HttpClientProxyAuthenticator.java	(original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/proxy/impl/HttpClientProxyAuthenticator.java	Sun Mar 13 14:52:35 2016
@@ -108,7 +108,7 @@
      * @param timeout Non-zero timeout in milliseconds for both connection and socket timeouts.
      */
     public void setTimeout(@Positive final int timeout) {
-        this.timeout = (int) Constraint.isGreaterThan(timeout, 0, "Timeout must be positive");
+        this.timeout = (int) Constraint.isGreaterThan(0, timeout, "Timeout must be positive");
     }
 
     @Override

Modified: trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/proxy/impl/HttpClientProxyAuthenticatorTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/proxy/impl/HttpClientProxyAuthenticatorTest.java?rev=8152&r1=8151&r2=8152&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/proxy/impl/HttpClientProxyAuthenticatorTest.java	(original)
+++ trunk/idp-cas-impl/src/test/java/net/shibboleth/idp/cas/proxy/impl/HttpClientProxyAuthenticatorTest.java	Sun Mar 13 14:52:35 2016
@@ -77,6 +77,7 @@
             } catch (NoSuchBeanDefinitionException e) {
                 trustEngine = null;
             }
+            authenticator.setTimeout(1600); // double timeout for Windows
             authenticator.authenticate(new URI("https://localhost:8443/?pgtId=A&pgtIOU=B"), trustEngine);
             if (expected != null) {
                 fail("Proxy authentication should have failed with " + expected);