From 28cfb6699e48bb08ee3fc11ac387cedfcde816a1 Mon Sep 17 00:00:00 2001
From: Jaime Perez Crespo <jaime.perez@uninett.no>
Date: Tue, 20 Jan 2015 13:29:06 +0100
Subject: [PATCH] Remove error handling code when session fails to initialise
 in SimpleSAML_Session::getSessionFromRequest().

---
 lib/SimpleSAML/Session.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/SimpleSAML/Session.php b/lib/SimpleSAML/Session.php
index b359ec66d..8f483475a 100644
--- a/lib/SimpleSAML/Session.php
+++ b/lib/SimpleSAML/Session.php
@@ -200,11 +200,6 @@ class SimpleSAML_Session {
 			/* For some reason, we were unable to initialize this session. Use a transient session instead. */
 			self::useTransientSession();
 
-			$globalConfig = SimpleSAML_Configuration::getInstance();
-			if ($globalConfig->getBoolean('session.disable_fallback', FALSE) === TRUE) {
-				throw $e;
-			}
-
 			if ($e instanceof SimpleSAML_Error_Exception) {
 				SimpleSAML_Logger::error('Error loading session:');
 				$e->logError();
@@ -212,7 +207,7 @@ class SimpleSAML_Session {
 				SimpleSAML_Logger::error('Error loading session: ' . $e->getMessage());
 			}
 
-			return self::$instance;
+			throw $e;
 		}
 
 		if(self::$instance !== NULL) {
-- 
GitLab