From 2dcea863433ec7083cd9a44c06ddc37892b2d0a0 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Thu, 29 Mar 2018 16:17:58 +0300
Subject: [PATCH] jps model: fixed loading facets (IDEA-CR-31190)

---
 .../org/jetbrains/jps/model/serialization/JpsProjectLoader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsProjectLoader.java b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsProjectLoader.java
index febba4572077..132f7442275e 100644
--- a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsProjectLoader.java
+++ b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsProjectLoader.java
@@ -445,7 +445,7 @@ public class JpsProjectLoader extends JpsLoaderBase {
       mergedFacetsTag = JDOMUtil.deepMerge(facetsTag, externalFacetsTag);
     }
     else {
-      mergedFacetsTag = null;
+      mergedFacetsTag = facetsTag;
     }
     JpsFacetSerializer.loadFacets(module, mergedFacetsTag);
     return module;