Merge branch 'master' of github.com:nicksieger/jruby-rack

nicksieger · Aug 16, 2011 · 8f0442b · 8f0442b
2 parents 65cfd8c + eb07e9c
commit 8f0442b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/ruby/jruby/rack/app_layout.rb b/src/main/ruby/jruby/rack/app_layout.rb
@@ -13,7 +13,7 @@ module Rack
     # hierarchy here is just for implementation sharing; if you
     # override the app layout by [insert mechanism here], then you
     # only need to accept a rack context in your initializer and
-    # provide the three *_path methods.
+    # provide the three *_uri methods.
     class AppLayout
       attr_reader :app_uri, :public_uri, :gem_uri
 

diff --git a/src/main/ruby/jruby/rack/session_store.rb b/src/main/ruby/jruby/rack/session_store.rb
@@ -108,6 +108,8 @@ def get_servlet_session(env, create = false)
 
     def close_session(env)
       (session = get_servlet_session(env)) and session.invalidate
+    rescue => exception
+      nil
     end
 
     def current_session_id(env)