[java-identity-provider COMMIT] /trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescrip...

[noreply at shibboleth.net]

Author: scantor
Date: Wed Aug 28 15:54:05 2013
New Revision: 4734

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4734&view=rev
Log:
Rename field to match accessors.

Modified:
    trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java

Modified: trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java?rev=4734&r1=4733&r2=4734&view=diff
==============================================================================
--- trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java (original)
+++ trunk/idp-authn-api/src/main/java/net/shibboleth/idp/authn/AuthenticationFlowDescriptor.java Wed Aug 28 15:54:05 2013
@@ -62,7 +62,7 @@
     @Duration private long lifetime;
     
     /** Maximum amount of time in milliseconds, since last usage, a flow should be considered active. */
-    @Duration private long timeout;
+    @Duration private long inactivityTimeout;
     
     /**
      * Supported principals, indexed by type, that the flow can produce.
@@ -147,22 +147,22 @@
 
     /**
      * Gets the maximum amount of time in milliseconds, since the last usage, a flow should be considered active.
-     * A value of 0 indicates that there is no inactivity timeout on an active flow.
+     * A value of 0 indicates that there is no inactivity inactivityTimeout on an active flow.
      * 
      * @return the duration.
      */
     public long getInactivityTimeout() {
-        return timeout;
+        return inactivityTimeout;
     }
 
     /**
      * Sets the maximum amount of time in milliseconds, since the last usage, a flow should be considered active.
      * A value of 0 indicates that there is no inactivity timeout on an active flow.
      * 
-     * @param inactivityTimeout the flow timeout, must be 0 or greater
-     */
-    public void setInactivityTimeout(@Duration long inactivityTimeout) {
-        timeout = Constraint.isGreaterThanOrEqual(0, inactivityTimeout,
+     * @param timeout the flow inactivity timeout, must be 0 or greater
+     */
+    public void setInactivityTimeout(@Duration long timeout) {
+        inactivityTimeout = Constraint.isGreaterThanOrEqual(0, timeout,
                 "Inactivity timeout must be greater than or equal to 0");
     }
     
@@ -261,6 +261,6 @@
     public String toString() {
         return Objects.toStringHelper(this).add("flowId", flowId).add("supportsPassive", supportsPassive)
                 .add("supportsForcedAuthentication", supportsForced).add("lifetime", lifetime)
-                .add("inactivityTimeout", timeout).toString();
+                .add("inactivityTimeout", inactivityTimeout).toString();
     }
 }