lib/interlock.rb in interlock-1.3 vs lib/interlock.rb in interlock-1.4

@@ -11,10 +11,14 @@
 require 'interlock/action_view'
 require 'interlock/finders'
 require 'interlock/active_record'
 
 begin
-  require 'memcached'
+  if defined?(JRUBY_VERSION)
+    require 'memcache-client'
+  else
+    require 'memcached'
+  end
 rescue LoadError
 end
 
 unless ActionController::Base.perform_caching
   RAILS_DEFAULT_LOGGER.warn "** interlock warning; config.perform_caching == false"