From b70683d765136917417d2a2a0b7d014ab8b7d16a Mon Sep 17 00:00:00 2001
From: ialbert <ialbert@mfd.ru>
Date: Fri, 12 Aug 2022 18:41:30 +0300
Subject: [PATCH] http://jira.mfd.msk:8088/browse/CLS-16

---
 .../imdg/iml/hazelcast/adapter/ImdgHazelcast.java  |  3 ++-
 .../platform/messaging/service/QueueConsumer.java  | 14 +++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/adapter/ImdgHazelcast.java b/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/adapter/ImdgHazelcast.java
index d60cadcdd..93b85cfce 100644
--- a/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/adapter/ImdgHazelcast.java
+++ b/platform-parent/platform-imdg-api-hazelcast-impl/src/main/java/ru/spcex/platform/imdg/iml/hazelcast/adapter/ImdgHazelcast.java
@@ -28,6 +28,7 @@ public class ImdgHazelcast<T extends SpcexObjectBase> implements Imdg<T> {
 
     @Override
     public void insert(T paramT) {
-        map.put(idGenerator.newId(), paramT);
+        paramT.setId(idGenerator.newId());
+        map.put(paramT.getId(), paramT);
     }
 }
diff --git a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/service/QueueConsumer.java b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/service/QueueConsumer.java
index f8643da44..0afa160d9 100644
--- a/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/service/QueueConsumer.java
+++ b/platform-parent/platform-messaging/src/main/java/ru/spcex/clearing/platform/messaging/service/QueueConsumer.java
@@ -39,11 +39,15 @@ public class QueueConsumer implements AutoCloseable {
             try {
                 consumer.subscribe(callbacks.keySet());
                 while (!closed.get()) {
-                    ConsumerRecords<String, Object> records = consumer.poll(Duration.of(10, ChronoUnit.SECONDS));
-                    for (ConsumerRecord<String, Object> next : records) {
-                        ConsumerSpecificClass<?> callback = callbacks.get(next.topic());
-                        Object o = json.readValue((String) next.value(), callback.getClazz());
-                        callback.acceptRaw(o);
+                    try {
+                        ConsumerRecords<String, Object> records = consumer.poll(Duration.of(10, ChronoUnit.SECONDS));
+                        for (ConsumerRecord<String, Object> next : records) {
+                            ConsumerSpecificClass<?> callback = callbacks.get(next.topic());
+                            Object o = json.readValue((String) next.value(), callback.getClazz());
+                            callback.acceptRaw(o);
+                        }
+                    } catch (Throwable e) {
+                        log.error(ExceptionUtils.getStackTrace(e));
                     }
                 }
             } catch (WakeupException e) {