Revert "leave entities attached"

This reverts commit 4be7001.
cryostatio · Oct 6, 2022 · fcb67be · fcb67be
1 parent b5b3a61
commit fcb67be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/main/java/io/cryostat/discovery/PluginInfoDao.java b/src/main/java/io/cryostat/discovery/PluginInfoDao.java
@@ -98,6 +98,7 @@ public PluginInfo update(UUID id, EnvironmentNode subtree) {
             plugin.setSubtree(gson.toJson(subtree));
             entityManager.merge(plugin);
             transaction.commit();
+            entityManager.detach(plugin);
 
             return plugin;
         } catch (Exception e) {
@@ -129,6 +130,7 @@ public PluginInfo update(UUID id, Collection<? extends AbstractNode> children) {
             plugin.setSubtree(gson.toJson(subtree));
             entityManager.merge(plugin);
             transaction.commit();
+            entityManager.detach(plugin);
 
             return plugin;
         } catch (Exception e) {

diff --git a/src/main/java/io/cryostat/storage/AbstractDao.java b/src/main/java/io/cryostat/storage/AbstractDao.java
@@ -69,6 +69,7 @@ public final T save(T t) {
             transaction.begin();
             entityManager.persist(t);
             transaction.commit();
+            entityManager.detach(t);
             return t;
         } catch (Exception e) {
             if (transaction != null) {
@@ -102,6 +103,9 @@ public final Optional<T> get(I id) {
         EntityTransaction transaction = entityManager.getTransaction();
         try {
             T t = entityManager.find(klazz, id);
+            if (t != null) {
+                entityManager.detach(t);
+            }
             return Optional.ofNullable(t);
         } catch (Exception e) {
             if (transaction != null) {