torquebox-web 3.0.1-java → 3.0.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f35e1566bb04c5dfba25ce12366ba816eed151f
-  data.tar.gz: a8e7fd9ae22b1a1ea0e8fa0cf922dd69e20cfcef
+  metadata.gz: fde7d8874954f3344565f726dfd357a00242f2b1
+  data.tar.gz: cc3385098a1171192b60d168e222056277ef5d3d
 SHA512:
-  metadata.gz: df555a30d5d17708ad0d380a82841c1c8ee3d59889370a23ee8f695c43bce168cee135895e0f3018e5a22126ba184baf8f06df2f065a3ac8c39cacdcabbd2a0b
-  data.tar.gz: b2d966690134749d027bbbc51e3ebbe4d730f46db860af006097864c4372031c08c3ba6ee2d79126df173cd3f29e12955a2a5fb647d774ab83edcfae1d65a7a7
+  metadata.gz: 6bffc80a4bbba053eaff9d896523ffa858981178d2414c814dd9a0dc8d855fc0a0cd703f69b69a59d01a8b397ae0e14fdced276022a4f9648294ec1e7b124f59
+  data.tar.gz: 55ecd05d6e33fc13ec970f0c98a2f92dde32461664ee4920c6a2c9c17291b3b0341bfad06300712d41a763a746f674e57c1d88ba60e5f1f043f973c05c35bac0

data/lib/torquebox-web.rb

@@ -1,6 +1,6 @@
 module TorqueboxWeb
-  VERSION = '3.0.1'
-  MAVEN_VERSION = '3.0.1'
+  VERSION = '3.0.2'
+  MAVEN_VERSION = '3.0.2'
 end
 begin
   require 'java'

data/lib/torquebox/session/servlet_store.rb

@@ -55,7 +55,7 @@ module TorqueBox
 
       def self.load_session(env)
         if torquebox_available?
-          session_data = load_session_data(env['java.servlet_request'].getSession(true))
+          session_data = load_session_data(env['java.servlet_request'].getSession(false))
         else
           session_data = @test_session_data
         end
@@ -67,7 +67,7 @@ module TorqueBox
         session_data = env['rack.session' ]
         if torquebox_available?
           ServletStore.store_session_data(env['java.servlet_request'].getSession(true),
-                                          session_data)
+                                          session_data) unless session_data.empty?
         else
           @test_session_data = session_data
         end
@@ -75,21 +75,23 @@ module TorqueBox
 
       def self.load_session_data(session)
         session_data = SessionData.new
-        session_data.java_session = session
-        session.getAttributeNames.each do |key|
-          if ( key == RAILS_SESSION_KEY )
-            marshalled_bytes = session.getAttribute(RAILS_SESSION_KEY)
-            if ( marshalled_bytes )
-              data = Marshal.load( String.from_java_bytes( marshalled_bytes ) )
-              session_data.update( data ) if Hash === data
+        if session
+          session_data.java_session = session
+          session.getAttributeNames.each do |key|
+            if ( key == RAILS_SESSION_KEY )
+              marshalled_bytes = session.getAttribute(RAILS_SESSION_KEY)
+              if ( marshalled_bytes )
+                data = Marshal.load( String.from_java_bytes( marshalled_bytes ) )
+                session_data.update( data ) if Hash === data
+              end
+            else
+              session_data[key] = session.getAttribute(key)
             end
-          else
-            session_data[key] = session.getAttribute(key)
           end
+          initial_keys = session_data.keys
+          session_data[:session_id] = session.getId()
+          session_data[:TORQUEBOX_INITIAL_KEYS] = initial_keys
         end
-        initial_keys = session_data.keys
-        session_data[:session_id] = session.getId()
-        session_data[:TORQUEBOX_INITIAL_KEYS] = initial_keys
         session_data
       end
 
@@ -153,7 +155,7 @@ module TorqueBox
       def [](key)
         super(key.to_s)
       end
-      
+
       def fetch(key, *args, &block)
         super(key.to_s, *args, &block)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torquebox-web
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: java
 authors:
 - The TorqueBox Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-22 00:00:00.000000000 Z
+date: 2014-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -49,9 +49,9 @@ files:
 - lib/torquebox-web.jar
 - lib/torquebox-web.rb
 - lib/gem_hook.rb
-- lib/torquebox/session/servlet_store.rb
-- lib/action_dispatch/session/torque_box_store.rb
 - lib/action_controller/session/torque_box_store.rb
+- lib/action_dispatch/session/torque_box_store.rb
+- lib/torquebox/session/servlet_store.rb
 - spec/servlet_store_spec.rb
 homepage: http://torquebox.org/
 licenses: