From 10d119b6253c4f0e191be0c0f0354814e07b2a44 Mon Sep 17 00:00:00 2001 From: kares Date: Tue, 19 Jan 2016 13:37:01 +0100 Subject: [PATCH 1/2] convert JRuby ext loading to 'new' format that works without auto-discovery ... expected to work on old JRubies as well as recent 1.7.x and 9K (which are broken otherwise) --- lib/pg_array_parser.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/pg_array_parser.rb b/lib/pg_array_parser.rb index 2721048..d9bf11a 100644 --- a/lib/pg_array_parser.rb +++ b/lib/pg_array_parser.rb @@ -1,11 +1,11 @@ require File.expand_path('../pg_array_parser/version', __FILE__) if RUBY_PLATFORM =~ /java/ + require 'jruby' + require File.expand_path('../pg_array_parser.jar', __FILE__) + Java::pgarrayparser.PgArrayParserEngineService.new.basicLoad JRuby.runtime + module PgArrayParser - require 'jruby' - require File.expand_path('../pg_array_parser.jar', __FILE__) - require 'pgArrayParser/pg_array_parser_engine' - def parse_pg_array(value) @parser ||= PgArrayParserEngine.new @parser.parse_pg_array(value) @@ -22,4 +22,3 @@ def parse_pg_array(value) end end end - From bad0cad48b70ec9a6e4f67452384d4f72813b646 Mon Sep 17 00:00:00 2001 From: kares Date: Tue, 19 Jan 2016 13:43:50 +0100 Subject: [PATCH 2/2] re-built ext .jar under JRuby 1.7.x (using Java 6 for compatibility) --- lib/pg_array_parser.jar | Bin 7923 -> 3075 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/lib/pg_array_parser.jar b/lib/pg_array_parser.jar index e6b1707ef36679743f257bc24fda1e263f3081f6..81ab3e1e98192a2dee7ed33a996bb26b94f0382a 100644 GIT binary patch delta 264 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