Bug fixes

Author: Katsute

.gitignore

@@ -5,7 +5,7 @@ out
 # Project ignore
 .docs
 src/LICENSE.txt
-/src/main/java/com/kttdevelopment/simplehttpserver/_ignore/
+/src/main/java/_ignore/
 # Gradle
 .gradle
 # Maven

src/main/java/com/kttdevelopment/simplehttpserver/HttpSessionHandler.java

@@ -1,8 +1,10 @@
 package com.kttdevelopment.simplehttpserver;
 
+import com.sun.net.httpserver.Headers;
 import com.sun.net.httpserver.HttpExchange;
 
 import java.util.*;
+import java.util.function.Predicate;
 
 /**
  * This class assigns {@link HttpSession} to every client.
@@ -13,7 +15,7 @@
  */
 public class HttpSessionHandler {
 
-    private final Map<String,HttpSession> sessions = new HashMap<>();
+    private final Map<String,HttpSession> sessions = Collections.synchronizedMap(new HashMap<>());
 
     private final String cookie;
 
@@ -55,6 +57,25 @@ public synchronized String assignSessionID(final HttpExchange exchange){
         return id;
     }
 
+    private final Predicate<Headers> hasSetHeader = new Predicate<>() {
+        @Override
+        public boolean test(final Headers headers){
+            if(headers.containsKey("Set-Cookie"))
+                for(final String value : headers.get("Set-Cookie"))
+                    if(value.startsWith(cookie + "="))
+                        return true;
+            return false;
+        }
+    };
+
+    private String getSetSession(final Headers headers){
+        if(headers.containsKey("Set-Cookie"))
+           for(final String value : headers.get("Set-Cookie"))
+               if(value.startsWith(cookie + "=")){
+                   return value.substring(value.indexOf(cookie + '=') + 1,value.indexOf(";"));
+       return null;
+    }
+
     /**
      * Returns the session of the client or assigns one if it does not yet have one Session will only be saved client side if the exchange headers are sent using {@link HttpExchange#sendResponseHeaders(int, long)}.
      *
@@ -79,68 +100,75 @@ public final HttpSession getSession(final HttpExchange exchange){
             }
         }
 
-        if((sessionId = cookies.get(cookie)) == null || !sessions.containsKey(sessionId)){
-            session = new HttpSession() {
-
-                private final String sessionID;
-                private final long creationTime;
-                private long lastAccessTime;
-
-                {
-                    sessionID = assignSessionID(exchange);
-                    creationTime = System.currentTimeMillis();
-                    lastAccessTime = creationTime;
-                    sessions.put(sessionID,this);
-                }
-
-                @Override
-                public final String getSessionID(){
-                    return sessionID;
-                }
-
-            //
-
-                @Override
-                public final long getCreationTime(){
-                    return creationTime;
-                }
-
-                @Override
-                public final long getLastAccessTime(){
-                    return lastAccessTime;
-                }
-
-                @Override
-                public synchronized final void updateLastAccessTime(){
-                    lastAccessTime = System.currentTimeMillis();
-                }
-
-            //
-
-                @SuppressWarnings("StringBufferReplaceableByString")
-                @Override
-                public final String toString(){
-                    final StringBuilder OUT = new StringBuilder();
-                    OUT.append("HttpSession")   .append('{');
-                    OUT.append("sessionID")     .append('=')   .append(sessionID)          .append(", ");
-                    OUT.append("creationTime")  .append('=')   .append(creationTime)       .append(", ");
-                    OUT.append("lastAccessTime").append('=')   .append(lastAccessTime);
-                    OUT.append('}');
-                    return OUT.toString();
-                }
-
-            };
-
-            final SimpleHttpCookie out =
-                new SimpleHttpCookie.Builder(cookie,session.getSessionID())
-                    .setPath("/")
-                    .setHttpOnly(true)
-                    .build();
-            exchange.getResponseHeaders().add("Set-Cookie",out.toCookieHeaderString());
-            sessions.put(sessionId,session);
-        }else{
-            session = sessions.get(sessionId);
+        final String cookieSessionId, setCookieSessionId;
+
+        synchronized(this){
+            if(
+                ((cookieSessionId = cookies.get(cookie)) == null || !sessions.containsKey(sessionId) ) &&  (setCookieSessionId = getSetSession(exchange.getResponseHeaders())) == null
+            ){
+                session = new HttpSession() {
+
+                    private final String sessionID;
+                    private final long creationTime;
+                    private long lastAccessTime;
+
+                    {
+                        sessionID = assignSessionID(exchange);
+                        creationTime = System.currentTimeMillis();
+                        lastAccessTime = creationTime;
+                        sessions.put(sessionID, this);
+                    }
+
+                    @Override
+                    public final String getSessionID(){
+                        return sessionID;
+                    }
+
+                    //
+
+                    @Override
+                    public final long getCreationTime(){
+                        return creationTime;
+                    }
+
+                    @Override
+                    public final long getLastAccessTime(){
+                        return lastAccessTime;
+                    }
+
+                    @Override
+                    public synchronized final void updateLastAccessTime(){
+                        lastAccessTime = System.currentTimeMillis();
+                    }
+
+                    //
+
+                    @SuppressWarnings("StringBufferReplaceableByString")
+                    @Override
+                    public final String toString(){
+                        final StringBuilder OUT = new StringBuilder();
+                        OUT.append("HttpSession").append('{');
+                        OUT.append("sessionID").append('=').append(sessionID).append(", ");
+                        OUT.append("creationTime").append('=').append(creationTime).append(", ");
+                        OUT.append("lastAccessTime").append('=').append(lastAccessTime);
+                        OUT.append('}');
+                        return OUT.toString();
+                    }
+
+                };
+
+                final SimpleHttpCookie out =
+                    new SimpleHttpCookie.Builder(cookie, session.getSessionID())
+                        .setPath("/")
+                        .setHttpOnly(true)
+                        .build();
+                exchange.getResponseHeaders().add("Set-Cookie", out.toCookieHeaderString());
+                sessions.put(session.getSessionID(), session);
+            }else{
+                session = sessions.get(sessionId);
+            }
         }
+        System.out.println(sessions);
         return session;
     }
 

src/main/java/com/kttdevelopment/simplehttpserver/SimpleHttpServerImpl.java

@@ -289,16 +289,16 @@ public final Map<HttpContext, HttpHandler> getContexts(){
 
             @Override
             public synchronized final String getRandomContext(){
-                return getRandomContext("/");
+                return getRandomContext("");
             }
 
             @Override
             public synchronized final String getRandomContext(final String context){
                 String targetContext;
 
-                final String head = getContext(context);
+                final String head = context.isEmpty() ? "" : getContext(context);
 
-                do targetContext = head + '/' + UUID.randomUUID().toString();
+                do targetContext = head + getContext(UUID.randomUUID().toString());
                     while(getContextHandler(targetContext) != null);
 
                 return targetContext;

src/main/java/com/kttdevelopment/simplehttpserver/handler/TemporaryHandler.java

@@ -57,9 +57,10 @@ public TemporaryHandler(final HttpHandler handler, final long maxTime){
 
     @Override
     public final void handle(final HttpExchange exchange) throws IOException{
-        if(!hasExpiry || expiry < System.currentTimeMillis())
+        if(!hasExpiry || System.currentTimeMillis() < expiry)
             handler.handle(exchange);
         exchange.getHttpContext().getServer().removeContext(exchange.getHttpContext());
+        exchange.close();
     }
 
     @Override