From 2c6b92b339477b134b9d4d5825431e00572887a3 Mon Sep 17 00:00:00 2001
From: herbert <herbert.eiselt@highstreet-technologies.com>
Date: Mon, 18 May 2020 16:07:04 +0200
Subject: Fix Cluster AkaTimeoutException

Issue-ID: SDNC-1191
Signed-off-by: herbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: I7a85d66778f6b278d960257d4d8664ec8605253e
---
 .../impl/GenericTransactionUtils.java                     | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/GenericTransactionUtils.java b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/GenericTransactionUtils.java
index 93f230a23..6a811ea59 100644
--- a/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/GenericTransactionUtils.java
+++ b/sdnr/wt/netconfnode-state-service/provider/src/main/java/org/onap/ccsdk/features/sdnr/wt/netconfnodestateservice/impl/GenericTransactionUtils.java
@@ -92,7 +92,7 @@ public final class GenericTransactionUtils implements TransactionUtils {
 
         int retry = 0;
         int retryDelayMilliseconds = 2000;
-        int maxRetries = 5; // 0 no Retry
+        int maxRetries = 0; // 0 no Retry
 
         do {
             if (retry > 0) {
@@ -107,8 +107,8 @@ public final class GenericTransactionUtils implements TransactionUtils {
 
             LOG.debug("Sending message with retry {} ", retry);
             statusIndicator.set("Create Read Transaction");
-
-            try (ReadTransaction readTransaction = dataBroker.newReadOnlyTransaction();) {
+            ReadTransaction readTransaction = dataBroker.newReadOnlyTransaction();
+            try {
                 @NonNull FluentFuture<Optional<T>> od = readTransaction.read(dataStoreType, iid);
                 statusIndicator.set("Read done");
                 if (od != null) {
@@ -119,19 +119,24 @@ public final class GenericTransactionUtils implements TransactionUtils {
                         data = optionalData.orElse(null);
                         statusIndicator.set("Read transaction done");
                         noErrorIndication.set(true);
+                    } else {
+                        statusIndicator.set("optional Data is null");
                     }
+                } else {
+                    statusIndicator.set("od feature is null");
                 }
-
-                readTransaction.close();
             } catch (CancellationException | ExecutionException | InterruptedException | NoSuchElementException e) {
                 statusIndicator.set(StackTrace.toString(e));
                 if (e instanceof InterruptedException) {
                     Thread.currentThread().interrupt();
                 }
+                LOG.debug("Exception during read", e);
             }
 
         } while (noErrorIndication.get() == false && retry++ < maxRetries);
 
+        LOG.debug("stage 2 noErrorIndication {} status text {}", noErrorIndication.get(), statusIndicator.get());
+
         return data;
     }
 
-- 
cgit 1.2.3-korg