From: Bruno Sakoto <bruno.sakoto@bell.ca>
Date: Thu, 22 Jul 2021 11:37:51 +0000 (+0000)
Subject: Merge "Fixed inconsistent data issue with replaceNode"
X-Git-Tag: 1.1.0~10
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9ac6d71e6b4297d26fddd2c8fb3095e15c2444da;p=cps.git

Merge "Fixed inconsistent data issue with replaceNode"
---

9ac6d71e6b4297d26fddd2c8fb3095e15c2444da
diff --cc cps-ri/src/main/java/org/onap/cps/spi/impl/CpsDataPersistenceServiceImpl.java
index 6e12d06011,81205a1da1..fdbafd4bee
--- a/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsDataPersistenceServiceImpl.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsDataPersistenceServiceImpl.java
@@@ -37,7 -37,10 +37,9 @@@ import java.util.Set
  import java.util.regex.Pattern;
  import java.util.stream.Collectors;
  import javax.transaction.Transactional;
+ import lombok.extern.slf4j.Slf4j;
+ import org.hibernate.StaleStateException;
  import org.onap.cps.cpspath.parser.CpsPathQuery;
 -import org.onap.cps.cpspath.parser.CpsPathQueryType;
  import org.onap.cps.spi.CpsDataPersistenceService;
  import org.onap.cps.spi.FetchDescendantsOption;
  import org.onap.cps.spi.entities.AnchorEntity;