summaryrefslogtreecommitdiff
path: root/gnu/javax/net/ssl/AbstractSessionContext.java
diff options
context:
space:
mode:
authorAndrew John Hughes <gnu_andrew@member.fsf.org>2015-06-19 16:04:59 +0100
committerAndrew John Hughes <gnu_andrew@member.fsf.org>2015-06-19 16:04:59 +0100
commit6bc8d84e4b0527f680b78a9a0c808cda74d4933d (patch)
tree835056047b4bde36f8d67b1656fa8dab8f6e1c6d /gnu/javax/net/ssl/AbstractSessionContext.java
parent591da8d224ab68474c4600d42fc74bafe974303a (diff)
downloadclasspath-6bc8d84e4b0527f680b78a9a0c808cda74d4933d.tar.gz
Mention PR66376.
2015-06-19 Andrew John Hughes <gnu_andrew@member.fsf.org> * NEWS: Mention PR66376.
Diffstat (limited to 'gnu/javax/net/ssl/AbstractSessionContext.java')
-rw-r--r--gnu/javax/net/ssl/AbstractSessionContext.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/gnu/javax/net/ssl/AbstractSessionContext.java b/gnu/javax/net/ssl/AbstractSessionContext.java
index 96a4e6dd0..031e53a84 100644
--- a/gnu/javax/net/ssl/AbstractSessionContext.java
+++ b/gnu/javax/net/ssl/AbstractSessionContext.java
@@ -1,5 +1,5 @@
/* AbstractSessionContext -- stores SSL sessions, possibly persistently.
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2015 Free Software Foundation, Inc.
This file is a part of GNU Classpath.
@@ -172,6 +172,7 @@ public abstract class AbstractSessionContext implements SSLSessionContext
* @return The found session, or null if no such session was found,
* or if that session has expired.
*/
+ @Override
public final SSLSession getSession (byte[] sessionId)
{
Session s = implGet (sessionId);
@@ -186,9 +187,9 @@ public abstract class AbstractSessionContext implements SSLSessionContext
public final SSLSession getSession(String host, int port)
{
- for (Enumeration e = getIds(); e.hasMoreElements(); )
+ for (Enumeration<byte[]> e = getIds(); e.hasMoreElements(); )
{
- byte[] id = (byte[]) e.nextElement();
+ byte[] id = e.nextElement();
SSLSession s = getSession(id);
if (s == null) // session expired.
continue;
@@ -221,6 +222,7 @@ public abstract class AbstractSessionContext implements SSLSessionContext
*/
protected abstract Session implGet (byte[] sessionId);
+ @Override
public int getSessionTimeout()
{
return (int) (timeout / 1000);
@@ -267,6 +269,7 @@ public abstract class AbstractSessionContext implements SSLSessionContext
/**
*
*/
+ @Override
public final void setSessionTimeout(int seconds)
{
if (timeout < 0)