From 590d3e7107e71b1892068b606cf0e29bf16acb7b Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Wed, 3 Sep 2014 12:32:56 +0200
Subject: [PATCH] fix ComponentVersionProcessingTest

---
 .../openapi/components/impl/stores/XmlElementStorage.java     | 4 ++--
 .../intellij/openapi/components/impl/stores/StorageData.java  | 2 +-
 2 files changed, 3 insertions(+), 3 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 1d8bf64cc3e5..ccb0b6fc08ed 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
@@ -156,7 +156,7 @@ public abstract class XmlElementStorage implements StateStorage, Disposable {
       }
 
       //noinspection deprecation
-      if (wasLoaded && !(myStreamProvider instanceof OldStreamProviderAdapter || myStreamProvider instanceof CurrentUserHolder)) {
+      if (wasLoaded && !myStreamProvider.isVersioningRequired() && !(myStreamProvider instanceof OldStreamProviderAdapter || myStreamProvider instanceof CurrentUserHolder)) {
         // we don't use local data if stream provider has one (to preserve backward compatibility, we don't use this logic for old stream providers)
         return result;
       }
@@ -576,7 +576,7 @@ public abstract class XmlElementStorage implements StateStorage, Disposable {
     myLoadedData = storageData;
   }
 
-  private void filterOutOfDate(Element element) {
+  private void filterOutOfDate(@NotNull Element element) {
     if (myRemoteVersionProvider == null) {
       return;
     }
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/StorageData.java b/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/StorageData.java
index 5a881845c2b9..cc8defca5ebd 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/StorageData.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/StorageData.java
@@ -85,7 +85,7 @@ public class StorageData {
         return merger.merge(serverElement, localElement);
       }
     }
-    return localElement;
+    return serverElement;
   }
 
   @Nullable