symfony
diff --git a/‎src/Symfony/Component/Security/Http/Firewall/ContextListener.php
Lines changed: 4 additions & 2 deletions b/‎src/Symfony/Component/Security/Http/Firewall/ContextListener.php
Lines changed: 4 additions & 2 deletions
diff --git a/‎src/Symfony/Component/Security/Tests/Http/Firewall/ContextListenerTest.php
Lines changed: 19 additions & 0 deletions b/‎src/Symfony/Component/Security/Tests/Http/Firewall/ContextListenerTest.php
Lines changed: 19 additions & 0 deletions
@@ -117,14 +117,16 @@ public function onKernelResponse(FilterResponseEvent $event)
         }
 
         $request = $event->getRequest();
-        $session = $request->hasPreviousSession() ? $request->getSession() : null;
+        $session = $request->getSession();
 
         if (null === $session) {
             return;
         }
 
         if ((null === $token = $this->context->getToken()) || ($token instanceof AnonymousToken)) {
-            $session->remove('_security_'.$this->contextKey);
+            if ($request->hasPreviousSession()) {
+                $session->remove('_security_'.$this->contextKey);
+            }
         } else {
             $session->set('_security_'.$this->contextKey, serialize($token));
         }
 
@@ -99,6 +99,25 @@ public function testOnKernelResponseWithoutSession()
         $listener = new ContextListener($this->securityContext, array(), 'session');
         $listener->onKernelResponse($event);
 
+        $this->assertTrue($session->isStarted());
+    }
+
+    {
+        $request = new Request();
+        $session = new Session(new MockArraySessionStorage());
+        $request->setSession($session);
+
+        $event = new FilterResponseEvent(
+            $this->getMock('Symfony\Component\HttpKernel\HttpKernelInterface'),
+            $request,
+            HttpKernelInterface::MASTER_REQUEST,
+            new Response()
+        );
+
+        $listener = new ContextListener($this->securityContext, array(), 'session');
+        $listener->onKernelResponse($event);
+
         $this->assertFalse($session->isStarted());
     }
Original file line number	Diff line number	Diff line change
`@@ -117,14 +117,16 @@ public function onKernelResponse(FilterResponseEvent $event)`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`$request = $event->getRequest();`
`120`		`- $session = $request->hasPreviousSession() ? $request->getSession() : null;`
	`120`	`+ $session = $request->getSession();`
`121`	`121`
`122`	`122`	`if (null === $session) {`
`123`	`123`	`return;`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`if ((null === $token = $this->context->getToken()) \|\| ($token instanceof AnonymousToken)) {`
`127`		`- $session->remove('_security_'.$this->contextKey);`
	`127`	`+ if ($request->hasPreviousSession()) {`
	`128`	`+ $session->remove('_security_'.$this->contextKey);`
	`129`	`+ }`
`128`	`130`	`} else {`
`129`	`131`	`$session->set('_security_'.$this->contextKey, serialize($token));`
`130`	`132`	`}`