openjpa-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgras...@apache.org
Subject svn commit: r1176526 - /openjpa/branches/1.0.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java
Date Tue, 27 Sep 2011 18:59:41 GMT
Author: jgrassel
Date: Tue Sep 27 18:59:41 2011
New Revision: 1176526

URL: http://svn.apache.org/viewvc?rev=1176526&view=rev
Log:
Revert 'OPENJPA-1993:Deadlock Potential with ORM XML Processing' revision 1172659

Modified:
    openjpa/branches/1.0.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java

Modified: openjpa/branches/1.0.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java?rev=1176526&r1=1176525&r2=1176526&view=diff
==============================================================================
--- openjpa/branches/1.0.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java
(original)
+++ openjpa/branches/1.0.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/meta/XMLMetaDataParser.java
Tue Sep 27 18:59:41 2011
@@ -360,12 +360,11 @@ public abstract class XMLMetaDataParser 
         try {
             _sourceName = sourceName;
             SAXParser parser = null;
-            boolean overrideCL = _overrideContextClassloader;
             ClassLoader oldLoader = null;
             ClassLoader overrideLoader = null;
             
             try {
-                if (overrideCL == true) {
+                if (_overrideContextClassloader == true) {
                     oldLoader = (ClassLoader) AccessController.doPrivileged(
                         J2DoPrivHelper.getContextClassLoaderAction());
                     
@@ -408,7 +407,7 @@ public abstract class XMLMetaDataParser 
                 JavaVersions.initCause(ioe, se);
                 throw ioe;
             } finally {
-                if (overrideCL == true) {
+                if (_overrideContextClassloader == true) {
                     // Restore the old ContextClassloader
                     try {
                         if (_log != null && _log.isTraceEnabled()) {



Mime
View raw message