From c3fe2e11591b0e25d3ff6f344f52de3b72820180 Mon Sep 17 00:00:00 2001
From: Maxim Gorbunkov <gorbunkov@haulmont.com>
Date: Thu, 30 Mar 2017 11:39:03 +0400
Subject: [PATCH] PL-8845 Entity import/export must produce JSON without
 complex id format

---
 .../cuba/core/app/serialization/EntitySerialization.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/global/src/com/haulmont/cuba/core/app/serialization/EntitySerialization.java b/modules/global/src/com/haulmont/cuba/core/app/serialization/EntitySerialization.java
index 9884a174b0..3943886d63 100644
--- a/modules/global/src/com/haulmont/cuba/core/app/serialization/EntitySerialization.java
+++ b/modules/global/src/com/haulmont/cuba/core/app/serialization/EntitySerialization.java
@@ -354,7 +354,7 @@ public class EntitySerialization implements EntitySerializationAPI {
             } else {
                 //fallback to platform version 6.4 where entity id format might be like this: sec$User-c838be0a-96d0-4ef4-a7c0-dff348347f93
                 //could be used by EntityImportExport. In next major release this check can be removed
-                if (idJsonElement != null && idJsonElement.isJsonPrimitive() && metaClass == null) {
+                if (idJsonElement != null && idJsonElement.isJsonPrimitive()) {
                     JsonPrimitive idPrimitive = jsonObject.getAsJsonPrimitive("id");
                     entityLoadInfo = EntityLoadInfo.parse(idPrimitive.getAsString());
                     if (entityLoadInfo != null) {