From 9c1a6769f516413b33848cfe996f6485ec7b4ccd Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Fri, 17 Oct 2014 21:33:08 +0400
Subject: [PATCH] deserialization of type-specific inner properties: don't pass
 'null' to 'loadState'

---
 .../openapi/components/ComponentSerializationUtil.java       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/core-impl/src/com/intellij/openapi/components/ComponentSerializationUtil.java b/platform/core-impl/src/com/intellij/openapi/components/ComponentSerializationUtil.java
index 33eee1a79178..0093d0016881 100644
--- a/platform/core-impl/src/com/intellij/openapi/components/ComponentSerializationUtil.java
+++ b/platform/core-impl/src/com/intellij/openapi/components/ComponentSerializationUtil.java
@@ -35,7 +35,10 @@ public class ComponentSerializationUtil {
   public static <S> void loadComponentState(@NotNull PersistentStateComponent<S> configuration, @Nullable Element element) {
     if (element != null) {
       Class<S> stateClass = getStateClass(configuration.getClass());
-      configuration.loadState(XmlSerializer.deserialize(element, stateClass));
+      S state = XmlSerializer.deserialize(element, stateClass);
+      if (state != null) {
+        configuration.loadState(state);
+      }
     }
   }
 }