OPENJPA-1993: Deadlock Potential with ORM XML Processing

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/1.0.x@1172659 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jody Grassel 2011-09-19 15:26:24 +00:00
parent f58a7dbc23
commit 4d46d7e924

View File

@ -360,11 +360,12 @@ public abstract class XMLMetaDataParser extends DefaultHandler
try {
_sourceName = sourceName;
SAXParser parser = null;
boolean overrideCL = _overrideContextClassloader;
ClassLoader oldLoader = null;
ClassLoader overrideLoader = null;
try {
if (_overrideContextClassloader == true) {
if (overrideCL == true) {
oldLoader = (ClassLoader) AccessController.doPrivileged(
J2DoPrivHelper.getContextClassLoaderAction());
@ -407,7 +408,7 @@ public abstract class XMLMetaDataParser extends DefaultHandler
JavaVersions.initCause(ioe, se);
throw ioe;
} finally {
if (_overrideContextClassloader == true) {
if (overrideCL == true) {
// Restore the old ContextClassloader
try {
if (_log != null && _log.isTraceEnabled()) {