Skip to content

Commit 2bdd3c0

Browse files
committed
remove JavaSupport.loadJavaClassVerbose deprecation
1 parent 725da07 commit 2bdd3c0

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

src/java/arjdbc/jdbc/DriverWrapper.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,16 @@ private Driver allocateDriver(final Class<? extends Driver> driverClass)
6565

6666
protected static Class<? extends Driver> loadDriver(final Ruby runtime, final String name)
6767
throws ClassCastException {
68-
@SuppressWarnings("unchecked")
69-
Class<? extends Driver> klass = runtime.getJavaSupport().loadJavaClassVerbose(name);
70-
if ( ! Driver.class.isAssignableFrom(klass) ) {
71-
throw new ClassCastException(klass + " is not assignable from " + Driver.class);
68+
try {
69+
@SuppressWarnings("unchecked")
70+
Class<? extends Driver> klass = (Class<? extends Driver>) runtime.getJavaSupport().loadJavaClass(name);
71+
if ( ! Driver.class.isAssignableFrom(klass) ) {
72+
throw new ClassCastException(klass + " is not assignable from " + Driver.class);
73+
}
74+
return klass;
75+
} catch (ClassNotFoundException e) {
76+
throw new RuntimeException("Cannot load driver class: " + name, e);
7277
}
73-
return klass;
7478
}
7579

7680
public Connection connect(final String url, final String user, final String pass)

0 commit comments

Comments
 (0)