more ArJdbc cleanup - we can live safely without the Jdbc::Mutex object

Author: kares

lib/arjdbc/jdbc/connection.rb

@@ -20,8 +20,6 @@ def initialize(config)
         connection # force the connection to load (@see RubyJDbcConnection.connection)
         set_native_database_types
         @stmts = {} # AR compatibility - statement cache not used
-      rescue ::ActiveRecord::ActiveRecordError
-        raise
       rescue Java::JavaSql::SQLException => e
         e = e.cause if defined?(NativeException) && e.is_a?(NativeException) # JRuby-1.6.8
         error = e.getMessage || e.getSQLState

lib/arjdbc/jdbc/discover.rb

@@ -1,4 +1,5 @@
 module ArJdbc
+  
   def self.discover_extensions
     if defined?(::Gem) && ::Gem.respond_to?(:find_files)
       files = ::Gem.find_files('arjdbc/discover')
@@ -8,11 +9,12 @@ def self.discover_extensions
         File.exist?(discover) ? discover : nil
       end.compact
     end
-    files.each do |f|
-      puts "Loading #{f}" if $DEBUG
-      require f
+    files.each do |file|
+      puts "Loading AR-JDBC extension #{file}" if $DEBUG
+      require file
     end
   end
 
   discover_extensions
-end
+  
+end

lib/arjdbc/jdbc/driver.rb

@@ -13,11 +13,11 @@ def initialize(name, properties = {})
           properties.each { |key, val| @properties[key] = val.to_s } if properties
         end
       end
-
+      
       def driver_class
         @driver_class ||= begin
           driver_class_const = (@name[0...1].capitalize + @name[1..@name.length]).gsub(/\./, '_')
-          Jdbc::Mutex.synchronized do
+          Jdbc::DriverManager.java_class.synchronized do # avoid 2 threads here
             unless Jdbc.const_defined?(driver_class_const)
               driver_class_name = @name
               Jdbc.module_eval do

lib/arjdbc/jdbc/java.rb

@@ -4,11 +4,9 @@
 module ActiveRecord
   module ConnectionAdapters
     module Jdbc
-      Mutex = java.lang.Object.new
       DriverManager = java.sql.DriverManager
       Types = java.sql.Types
     end
-
     java_import "arjdbc.jdbc.JdbcConnectionFactory"
   end
 end