Return-Path: Delivered-To: apmail-openjpa-commits-archive@www.apache.org Received: (qmail 90048 invoked from network); 17 Nov 2009 23:10:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 17 Nov 2009 23:10:06 -0000 Received: (qmail 5093 invoked by uid 500); 17 Nov 2009 23:10:06 -0000 Delivered-To: apmail-openjpa-commits-archive@openjpa.apache.org Received: (qmail 5059 invoked by uid 500); 17 Nov 2009 23:10:06 -0000 Mailing-List: contact commits-help@openjpa.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openjpa.apache.org Delivered-To: mailing list commits@openjpa.apache.org Received: (qmail 5050 invoked by uid 99); 17 Nov 2009 23:10:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Nov 2009 23:10:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Nov 2009 23:10:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 201892388904; Tue, 17 Nov 2009 23:09:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r881612 - /openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/sql/DBDictionaryFactory.java Date: Tue, 17 Nov 2009 23:09:43 -0000 To: commits@openjpa.apache.org From: mikedd@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091117230943.201892388904@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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();