Try to use Ehcache from CLASSPATH before bundled.

elskwid · Nov 2, 2010 · bc6f2a9 · bc6f2a9
1 parent e68d78e
commit bc6f2a9
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/lib/ehcache/java.rb b/lib/ehcache/java.rb
@@ -1,6 +1,17 @@
-module Ehcache
+require 'java'
+
+begin
+  # If Ehcache is already on the classpath, use it.
+  ehcache_version = Java::NetSfEhcacheUtil::ProductInfo.new.getVersion()
+  puts("Using Ehcache #{ehcache_version} from CLASSPATH")
+rescue NameError
+  # If not, use the Ehcache bundled with the jruby-ehcache gem.
   Dir["#{Ehcache::EHCACHE_HOME}/ext/**/*.jar"].sort.each {|l| require l}
+  ehcache_version = Java::NetSfEhcacheUtil::ProductInfo.new.getVersion()
+  puts("Using bundled Ehcache #{ehcache_version}")
+end
 
+module Ehcache
   include_package 'net.sf.ehcache'
 
   module Config