Fixed small bugs in logging and handle expiration logic. Bugzilla #312.

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1424 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/src/edu/internet2/middleware/shibboleth/common/provider/AQHNameIdentifierMapping.java b/src/edu/internet2/middleware/shibboleth/common/provider/AQHNameIdentifierMapping.java
index de84609..c1cd665 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/common/provider/AQHNameIdentifierMapping.java
+++ b/src/edu/internet2/middleware/shibboleth/common/provider/AQHNameIdentifierMapping.java
@@ -2,26 +2,25 @@
  * The Shibboleth License, Version 1. Copyright (c) 2002 University Corporation for Advanced Internet Development, Inc.
  * All rights reserved Redistribution and use in source and binary forms, with or without modification, are permitted
  * provided that the following conditions are met: Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the
- * above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other
- * materials provided with the distribution, if any, must include the following acknowledgment: "This product includes
- * software developed by the University Corporation for Advanced Internet Development <http://www.ucaid.edu> Internet2
- * Project. Alternately, this acknowledegement may appear in the software itself, if and wherever such third-party
- * acknowledgments normally appear. Neither the name of Shibboleth nor the names of its contributors, nor Internet2,
- * nor the University Corporation for Advanced Internet Development, Inc., nor UCAID may be used to endorse or promote
- * products derived from this software without specific prior written permission. For written permission, please
- * contact shibboleth@shibboleth.org Products derived from this software may not be called Shibboleth, Internet2,
- * UCAID, or the University Corporation for Advanced Internet Development, nor may Shibboleth appear in their name,
- * without prior written permission of the University Corporation for Advanced Internet Development. THIS SOFTWARE IS
- * PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND WITH ALL FAULTS. ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND
- * NON-INFRINGEMENT ARE DISCLAIMED AND THE ENTIRE RISK OF SATISFACTORY QUALITY, PERFORMANCE, ACCURACY, AND EFFORT IS
- * WITH LICENSEE. IN NO EVENT SHALL THE COPYRIGHT OWNER, CONTRIBUTORS OR THE UNIVERSITY CORPORATION FOR ADVANCED
- * INTERNET DEVELOPMENT, INC. BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * notice, this list of conditions and the following disclaimer. Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials
+ * provided with the distribution, if any, must include the following acknowledgment: "This product includes software
+ * developed by the University Corporation for Advanced Internet Development <http://www.ucaid.edu> Internet2 Project.
+ * Alternately, this acknowledegement may appear in the software itself, if and wherever such third-party
+ * acknowledgments normally appear. Neither the name of Shibboleth nor the names of its contributors, nor Internet2, nor
+ * the University Corporation for Advanced Internet Development, Inc., nor UCAID may be used to endorse or promote
+ * products derived from this software without specific prior written permission. For written permission, please contact
+ * shibboleth@shibboleth.org Products derived from this software may not be called Shibboleth, Internet2, UCAID, or the
+ * University Corporation for Advanced Internet Development, nor may Shibboleth appear in their name, without prior
+ * written permission of the University Corporation for Advanced Internet Development. THIS SOFTWARE IS PROVIDED BY THE
+ * COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND WITH ALL FAULTS. ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT ARE
+ * DISCLAIMED AND THE ENTIRE RISK OF SATISFACTORY QUALITY, PERFORMANCE, ACCURACY, AND EFFORT IS WITH LICENSEE. IN NO
+ * EVENT SHALL THE COPYRIGHT OWNER, CONTRIBUTORS OR THE UNIVERSITY CORPORATION FOR ADVANCED INTERNET DEVELOPMENT, INC.
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 package edu.internet2.middleware.shibboleth.common.provider;
@@ -43,13 +42,14 @@ import edu.internet2.middleware.shibboleth.common.NameIdentifierMappingException
  */
 public abstract class AQHNameIdentifierMapping extends BaseNameIdentifierMapping {
 
-       private static Logger           log                     = Logger.getLogger(AQHNameIdentifierMapping.class.getName());
+       private static Logger log = Logger.getLogger(AQHNameIdentifierMapping.class.getName());
        /** Time in seconds for which handles are valid */
-       protected long                          handleTTL       = 1800;
-       protected static QName[]        errorCodes      = {SAMLException.REQUESTER,
+       protected long handleTTL = 1800;
+       protected static QName[] errorCodes = {SAMLException.REQUESTER,
                        new QName(edu.internet2.middleware.shibboleth.common.XML.SHIB_NS, "InvalidHandle")};
 
        public AQHNameIdentifierMapping(Element config) throws NameIdentifierMappingException {
+
                super(config);
 
                String rawTTL = ((Element) config).getAttribute("handleTTL");
@@ -61,7 +61,7 @@ public abstract class AQHNameIdentifierMapping extends BaseNameIdentifierMapping
                                                        + "value.  It is recommended that you increase it.");
                                }
                        }
-                       log.debug("Attribute Query Handle TTL set to (" + handleTTL + ") milliseconds.");
+                       log.debug("Attribute Query Handle TTL set to (" + handleTTL + ") seconds.");
 
                } catch (NumberFormatException nfe) {
                        log.error("Value for attribute \"handleTTL\" mus be a long integer.");
@@ -70,15 +70,16 @@ public abstract class AQHNameIdentifierMapping extends BaseNameIdentifierMapping
        }
 
        protected HandleEntry createHandleEntry(AuthNPrincipal principal) {
+
                return new HandleEntry(principal, handleTTL);
        }
 }
 
 class HandleEntry implements Serializable {
 
-       static final long                       serialVersionUID        = 1L;
-       protected AuthNPrincipal        principal;
-       protected long                          expirationTime;
+       static final long serialVersionUID = 1L;
+       protected AuthNPrincipal principal;
+       protected long expirationTime;
 
        /**
         * Creates a HandleEntry
@@ -89,11 +90,13 @@ class HandleEntry implements Serializable {
         *            the time, in seconds, for which the handle should be valid.
         */
        protected HandleEntry(AuthNPrincipal principal, long TTL) {
+
                this.principal = principal;
                expirationTime = System.currentTimeMillis() + (TTL * 1000);
        }
 
        protected boolean isExpired() {
-               return (System.currentTimeMillis() > expirationTime);
+
+               return (System.currentTimeMillis() >= expirationTime);
        }
 }