[Jifty-commit] r1748 - jifty/trunk/lib/Jifty/Web/Session

[jifty-commit at lists.jifty.org]

Author: audreyt
Date: Thu Aug  3 21:07:41 2006
New Revision: 1748

Modified:
   jifty/trunk/lib/Jifty/Web/Session/ClientSide.pm

Log:
* Web::Session::ClientSide - if reassembly of cookies failed, start a new session.

Modified: jifty/trunk/lib/Jifty/Web/Session/ClientSide.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Session/ClientSide.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/Session/ClientSide.pm	Thu Aug  3 21:07:41 2006
@@ -90,9 +90,23 @@
             : Jifty::Model::Session->new_session_id,
     }
 
-    my ($data) = grep {
-        $_->name eq "JIFTY_DAT_$session_id"
-    } $splitter->join(values %cookies);
+    my $data;
+
+    {
+        local $@;
+        eval {
+            ($data) = grep {
+                $_->name eq "JIFTY_DAT_$session_id"
+            } $splitter->join(values %cookies);
+        };
+
+        if ($@) {
+            # Reassembly of cookie failed -- start a new session
+            $session_id = Jifty::Model::Session->new_session_id;
+            warn $@;
+        }
+    }
+
     if ($data) {
         local $@;
         eval {