Permalink
Browse files

Fix for gem build; Workaround for JRUBY-5842

  • Loading branch information...
1 parent 3e7fb22 commit 300eb04458a67a4d881cce6ee46f8889ac3d5d0d @dazuma committed Jun 3, 2011
Showing with 9 additions and 2 deletions.
  1. +2 −1 History.rdoc
  2. +1 −0 blockenspiel.gemspec
  3. +6 −1 lib/blockenspiel/impl.rb
View
@@ -1,7 +1,8 @@
-=== 0.4.2 / 2011-05-31
+=== 0.4.2 / 2011-06-02
* Fixed an unmixer compatibility issue with Rubinius > 1.2.x. (Thanks to @meh for the fix.)
* Recent versions of Rubinius raised exceptions involving Fiber. Fixed.
+* Workaround for a JRuby NullPointerException (JRUBY-5842).
* Integrated JRuby platform gem back into main gem.
* A .gemspec file is now available for gem building and bundler git integration.
* Some cleanup of the Rakefile and tests.
View
@@ -16,4 +16,5 @@
s_.extra_rdoc_files = ::Dir.glob("*.rdoc")
s_.test_files = ::Dir.glob("test/**/tc_*.rb")
s_.platform = ::Gem::Platform::RUBY
+ s_.extensions = ::Dir.glob("ext/*/extconf.rb")
end
View
@@ -530,7 +530,12 @@ def self._proxy_dispatch(proxy_, name_, params_, block_) # :nodoc:
require 'fiber'
raise ::LoadError unless defined?(::Fiber)
def self._current_context_id # :nodoc:
- ::Fiber.current.object_id
+ begin
+ ::Fiber.current.object_id
+ rescue ::Exception
+ # JRuby hack (see JRUBY-5842)
+ ::Thread.current.object_id
+ end
end
rescue ::LoadError
def self._current_context_id # :nodoc:

0 comments on commit 300eb04

Please sign in to comment.