From d80c339dbda8899cb9d5ae297943611d9fa85475 Mon Sep 17 00:00:00 2001 From: rautenberg Date: Thu, 24 Jan 2013 11:43:38 +0100 Subject: remove some rescue blocks from A&A --- lib/authorization-helper.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/authorization-helper.rb b/lib/authorization-helper.rb index 5e2f1d5..262ab37 100644 --- a/lib/authorization-helper.rb +++ b/lib/authorization-helper.rb @@ -107,7 +107,7 @@ module OpenTox # Get subjectid out of session, params or rack-environment and unescape it if necessary # @return [String] subjectid def get_subjectid - begin + #begin subjectid = nil subjectid = session[:subjectid] if session[:subjectid] subjectid = params[:subjectid] if params[:subjectid] and !subjectid @@ -115,9 +115,9 @@ module OpenTox # see http://rack.rubyforge.org/doc/SPEC.html subjectid = CGI.unescape(subjectid) if subjectid.include?("%23") @subjectid = subjectid - rescue - @subjectid = nil - end + #rescue + # @subjectid = nil + #end end end -- cgit v1.2.3 From 345876e00454d9051ef9b591dbab2a8395083347 Mon Sep 17 00:00:00 2001 From: rautenberg Date: Thu, 24 Jan 2013 13:05:41 +0100 Subject: one step back --- lib/authorization-helper.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/authorization-helper.rb b/lib/authorization-helper.rb index 262ab37..5e2f1d5 100644 --- a/lib/authorization-helper.rb +++ b/lib/authorization-helper.rb @@ -107,7 +107,7 @@ module OpenTox # Get subjectid out of session, params or rack-environment and unescape it if necessary # @return [String] subjectid def get_subjectid - #begin + begin subjectid = nil subjectid = session[:subjectid] if session[:subjectid] subjectid = params[:subjectid] if params[:subjectid] and !subjectid @@ -115,9 +115,9 @@ module OpenTox # see http://rack.rubyforge.org/doc/SPEC.html subjectid = CGI.unescape(subjectid) if subjectid.include?("%23") @subjectid = subjectid - #rescue - # @subjectid = nil - #end + rescue + @subjectid = nil + end end end -- cgit v1.2.3