Merge pull request #6 from noppoMan/noppoMan-patch-1

fix bug of context.session is null on first access
noppoMan · Jul 13, 2017 · 7c87dc4 · 7c87dc4
2 parents 56ebd59 + 6f0109d
commit 7c87dc4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Sources/HexavilleFramework/Session/SessionMiddleware.swift b/Sources/HexavilleFramework/Session/SessionMiddleware.swift
@@ -56,10 +56,10 @@ public final class SessionMiddleware: Middleware {
         for cookie in cookies {
             do {
                 let session = Session(id: cookie.value, store: store, ttl: cookieAttribute.expiration)
+                context.session = session
                 if let values = try store.read(forKey: session.id) {
                     session.storage = values
                 }
-                context.session = session
                 break
             } catch {
                 //print("Session was failed to read. reason: \(error)")