You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by mi...@apache.org on 2009/11/18 00:09:43 UTC
svn commit: r881612 -
/openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java
Author: mikedd
Date: Tue Nov 17 23:09:42 2009
New Revision: 881612
URL: http://svn.apache.org/viewvc?rev=881612&view=rev
Log:
OPENJPA-1384:
Try current classloader when loading DBDictionary.
Submitted By: B.J. Reed
Modified:
openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java
Modified: openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java?rev=881612&r1=881611&r2=881612&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java (original)
+++ openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java Tue Nov 17 23:09:42 2009
@@ -122,6 +122,18 @@
DBDictionary.class)));
dict = (DBDictionary) AccessController.doPrivileged(
J2DoPrivHelper.newInstanceAction(c));
+ } catch (ClassNotFoundException cnfe) {
+ // if the dictionary was not found, make another attempt
+ // at loading the dictionary using the current thread.
+ try {
+ Class c = Thread.currentThread().getContextClassLoader().loadClass(dclass);
+ dict = (DBDictionary) AccessController.doPrivileged(
+ J2DoPrivHelper.newInstanceAction(c));
+ } catch (Exception e) {
+ if (e instanceof PrivilegedActionException)
+ e = ((PrivilegedActionException) e).getException();
+ throw new UserException(e).setFatal(true);
+ }
} catch (Exception e) {
if (e instanceof PrivilegedActionException)
e = ((PrivilegedActionException) e).getException();