From 636b72cce979bdff28d9d8c87d20ece325deccaf Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <Dmitry.Avdeev@jetbrains.com>
Date: Wed, 1 Aug 2012 13:26:20 +0400
Subject: [PATCH] resolving priority fixed

---
 .../intellij/javaee/ExternalResourceManagerImpl.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java b/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java
index ed3aa301d460..be0783628e78 100644
--- a/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java
+++ b/xml/impl/src/com/intellij/javaee/ExternalResourceManagerImpl.java
@@ -143,11 +143,13 @@ public class ExternalResourceManagerImpl extends ExternalResourceManagerEx imple
   public String getResourceLocation(@NonNls String url, String version) {
     String result = getUserResource(url, version);
     if (result == null) {
-      result = getStdResource(url, version);
+      XMLCatalogManager manager = getCatalogManager();
+      if (manager != null) {
+        result = manager.resolve(url);
+      }
     }
-    XMLCatalogManager manager = getCatalogManager();
-    if (manager != null) {
-      result = manager.resolve(url);
+    if (result == null) {
+      result = getStdResource(url, version);
     }
     if (result == null) {
       result = url;