Skip to content
This repository was archived by the owner on Mar 15, 2022. It is now read-only.

Replaces compiled Java with JRuby interop #17

Merged
merged 1 commit into from
Jan 29, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 0 additions & 28 deletions ext/java/org/jruby/ext/ref/ReferencesService.java

This file was deleted.

43 changes: 0 additions & 43 deletions ext/java/org/jruby/ext/ref/RubySoftReference.java

This file was deleted.

43 changes: 0 additions & 43 deletions ext/java/org/jruby/ext/ref/RubyWeakReference.java

This file was deleted.

Binary file removed lib/org/jruby/ext/ref/references.jar
Binary file not shown.
12 changes: 5 additions & 7 deletions lib/ref.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,11 @@ module Ref

# Set the best implementation for weak references based on the runtime.
if defined?(RUBY_PLATFORM) && RUBY_PLATFORM == 'java'
# Use native Java references
begin
$LOAD_PATH.unshift(File.dirname(__FILE__))
require 'org/jruby/ext/ref/references'
ensure
$LOAD_PATH.shift if $LOAD_PATH.first == File.dirname(__FILE__)
end
$LOAD_PATH.unshift(File.dirname(__FILE__))
require 'ref/jruby/weak_reference'
require 'ref/jruby/soft_reference'

$LOAD_PATH.shift if $LOAD_PATH.first == File.dirname(__FILE__)
else
require 'ref/soft_reference'
if defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ironruby'
Expand Down
13 changes: 13 additions & 0 deletions lib/ref/jruby/soft_reference.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
module Ref

class SoftReference < Reference
def initialize(obj)
@_ref = java.lang.ref.SoftReference.new(obj)
@referenced_object_id = obj.__id__
end

def object
@_ref.get()
end
end
end
15 changes: 15 additions & 0 deletions lib/ref/jruby/weak_reference.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
module Ref
class WeakReference < Reference

def initialize(obj)
@_ref = java.lang.ref.WeakReference.new(obj)
@referenced_object_id = obj.__id__
end

def object
@_ref.get()
end

end

end