summaryrefslogtreecommitdiff
path: root/gnu/javax/net/ssl/AbstractSessionContext.java
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/javax/net/ssl/AbstractSessionContext.java')
-rw-r--r--gnu/javax/net/ssl/AbstractSessionContext.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/gnu/javax/net/ssl/AbstractSessionContext.java b/gnu/javax/net/ssl/AbstractSessionContext.java
index 590d49a7f..916fec089 100644
--- a/gnu/javax/net/ssl/AbstractSessionContext.java
+++ b/gnu/javax/net/ssl/AbstractSessionContext.java
@@ -105,7 +105,7 @@ public abstract class AbstractSessionContext implements SSLSessionContext
* @return The new session context.
* @throws SSLException If an error occurs in creating the instance.
*/
- public static SSLSessionContext newInstance () throws SSLException
+ public static AbstractSessionContext newInstance () throws SSLException
{
try
{
@@ -173,7 +173,8 @@ public abstract class AbstractSessionContext implements SSLSessionContext
public final SSLSession getSession (byte[] sessionId)
{
Session s = implGet (sessionId);
- if (System.currentTimeMillis () - s.getLastAccessedTime () > timeout)
+ if (s != null
+ && System.currentTimeMillis () - s.getLastAccessedTime () > timeout)
{
remove (sessionId);
return null;