Conditionally boot the extension only if not booted already.

headius · headius · commit e0730f87687b · 2013-10-22T07:57:56.000-05:00
Rather than using the older method for booting the jopenssl extension, we now directly load the library. However, this does not enlist in require logic, so it can load twice if done unconditionally. This commit modifies that loading to only occur if the jopenssl.jar library has not been loaded before. Fixes jruby#1071
diff --git a/lib/ruby/shared/openssl.rb b/lib/ruby/shared/openssl.rb
@@ -11,8 +11,10 @@
 
 # Load extension
 require 'jruby'
-require 'jopenssl.jar'
-org.jruby.ext.openssl.OSSLLibrary.new.load(JRuby.runtime, false)
+# only boot ext if jar has not been loaded before
+if require 'jopenssl.jar'
+  org.jruby.ext.openssl.OSSLLibrary.new.load(JRuby.runtime, false)
+end
 
 if RUBY_VERSION >= '1.9.0'
   load('jopenssl19/openssl.rb')
diff --git a/maven/gems/jruby-openssl/lib/jruby-openssl.rb b/maven/gems/jruby-openssl/lib/jruby-openssl.rb
@@ -15,8 +15,10 @@
 
 # Load extension
 require 'jruby'
-require 'jopenssl.jar'
-org.jruby.ext.openssl.OSSLLibrary.new.load(JRuby.runtime, false)
+# only boot ext if jar has not been loaded before
+if require 'jopenssl.jar'
+  org.jruby.ext.openssl.OSSLLibrary.new.load(JRuby.runtime, false)
+end
 
 if RUBY_VERSION >= '1.9.0'
   load('jopenssl19/openssl.rb')
