1 files changed, 16 insertions, 12 deletions
diff --git a/xml/xml-psi-impl/src/com/intellij/javaee/ExternalResourceManagerExImpl.java b/xml/xml-psi-impl/src/com/intellij/javaee/ExternalResourceManagerExImpl.java
index 4d58a5524bfe..d5bec52f6091 100644
--- a/xml/xml-psi-impl/src/com/intellij/javaee/ExternalResourceManagerExImpl.java
+++ b/xml/xml-psi-impl/src/com/intellij/javaee/ExternalResourceManagerExImpl.java
@@ -514,18 +514,23 @@ public class ExternalResourceManagerExImpl extends ExternalResourceManagerEx {
       if (classLoader == null && clazz == null) return file;
 
       final URL resource = clazz == null ? classLoader.getResource(file) : clazz.getResource(file);
-      classLoader = null;
-      clazz = null;
-      if (resource == null) {
-        String message = "Cannot find standard resource. filename:" + file + " class=" + classLoader;
-        if (ApplicationManager.getApplication().isUnitTestMode()) {
-          LOG.error(message);
-        }
-        else {
-          LOG.warn(message);
-        }
 
-        return null;
+      try {
+        if (resource == null) {
+          String message = "Cannot find standard resource. filename:" + file + " class=" + clazz + ", classLoader:" + classLoader;
+          if (ApplicationManager.getApplication().isUnitTestMode()) {
+            LOG.error(message);
+          }
+          else {
+            LOG.warn(message);
+          }
+
+          return null;
+        }
+      }
+      finally {
+        classLoader = null;
+        clazz = null;
       }
 
       String path = FileUtil.unquote(resource.toString());
@@ -535,7 +540,6 @@ public class ExternalResourceManagerExImpl extends ExternalResourceManagerEx {
       return path;
     }
 
-
     @Override
     public boolean equals(Object o) {
       if (this == o) return true;