From 2415da14684503e1f8a0e498ab9230d8ab6c735f Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 11 Sep 2012 18:31:33 +0400 Subject: [PATCH] Duplicate logging dropped; cleanup --- .../openapi/components/impl/stores/XmlElementStorage.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/XmlElementStorage.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/XmlElementStorage.java index 700c9e97f943..9433a6bba8d2 100644 --- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/XmlElementStorage.java +++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/XmlElementStorage.java @@ -163,9 +163,6 @@ public abstract class XmlElementStorage implements StateStorage, Disposable { if (document != null) { loadState(result, document.getRootElement()); } - else { - LOG.info("Document was not loaded for " + myFileSpec); - } if (!myIsProjectSettings && useProvidersData) { for (RoamingType roamingType : RoamingType.values()) { @@ -173,11 +170,9 @@ public abstract class XmlElementStorage implements StateStorage, Disposable { try { if (myStreamProvider.isEnabled()) { final Document sharedDocument = StorageUtil.loadDocument(myStreamProvider.loadContent(myFileSpec, roamingType)); - if (sharedDocument != null) { filterComponentsDisabledForRoaming(sharedDocument.getRootElement(), roamingType); filterOutOfDateComponents(sharedDocument.getRootElement()); - loadState(result, sharedDocument.getRootElement()); } } @@ -186,11 +181,9 @@ public abstract class XmlElementStorage implements StateStorage, Disposable { LOG.warn(e); } } - } } - return result; }