[jpa] Don't rollback failed transactions (#20645)

Signed-off-by: Cody Cutrer <cody@cutrer.us>

Author: ccutrer

bundles/org.openhab.persistence.jpa/src/main/java/org/openhab/persistence/jpa/internal/JpaPersistenceService.java

@@ -169,9 +169,9 @@ public void store(Item item, @Nullable String alias) {
                 // a duplicate timestamp. Just ignore
                 logger.debug("Failed to persist item {} because of duplicate timestamp", name);
             } else {
-                logger.error("Error while persisting item! Rolling back!", e);
+                logger.error("Error while persisting item! Rolling back if needed.", e);
             }
-            em.getTransaction().rollback();
+            rollbackIfActive(em, "persisting item " + name);
         } finally {
             em.close();
         }
@@ -266,7 +266,7 @@ public Iterable<HistoricItem> query(FilterCriteria filter, @Nullable String alia
             return historicList;
         } catch (Exception e) {
             logger.error("Error while querying database!", e);
-            em.getTransaction().rollback();
+            rollbackIfActive(em, "querying historic items");
         } finally {
             em.close();
         }
@@ -325,6 +325,16 @@ protected boolean isEntityManagerFactoryOpen() {
         return emf != null && emf.isOpen();
     }
 
+    private void rollbackIfActive(EntityManager em, String operation) {
+        try {
+            if (em.getTransaction().isActive()) {
+                em.getTransaction().rollback();
+            }
+        } catch (Exception rollbackException) {
+            logger.warn("Rollback after {} failed", operation, rollbackException);
+        }
+    }
+
     /**
      * Return the persistence unit as in persistence.xml file.
      *

bundles/org.openhab.persistence.jpa/src/test/java/org/openhab/persistence/jpa/internal/JpaPersistenceServiceTest.java

@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2010-2026 Contributors to the openHAB project
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.openhab.persistence.jpa.internal;
+
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.util.Map;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+import org.junit.jupiter.api.Test;
+import org.openhab.core.items.Item;
+import org.openhab.core.items.ItemRegistry;
+import org.openhab.core.library.types.DecimalType;
+import org.osgi.framework.BundleContext;
+
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityTransaction;
+
+/**
+ * Tests for {@link JpaPersistenceService}.
+ *
+ * @author Cody Cutrer
+ */
+@NonNullByDefault
+class JpaPersistenceServiceTest {
+
+    @Test
+    void storeDoesNotRollbackInactiveTransactionAfterCommitFailure() {
+        EntityManagerFactory entityManagerFactory = mock(EntityManagerFactory.class);
+        EntityManager entityManager = mock(EntityManager.class);
+        EntityTransaction transaction = mock(EntityTransaction.class);
+        Item item = mock(Item.class);
+
+        when(entityManagerFactory.createEntityManager()).thenReturn(entityManager);
+        when(entityManager.getTransaction()).thenReturn(transaction);
+        when(item.getName()).thenReturn("Kitchen_Persons");
+        when(item.getState()).thenReturn(new DecimalType(1));
+        when(transaction.isActive()).thenReturn(false);
+
+        RuntimeException commitFailure = new RuntimeException("commit failed");
+        org.mockito.Mockito.doThrow(commitFailure).when(transaction).commit();
+
+        JpaPersistenceService service = new TestJpaPersistenceService(entityManagerFactory);
+
+        assertDoesNotThrow(() -> service.store(item));
+
+        verify(transaction, never()).rollback();
+        verify(entityManager).close();
+    }
+
+    @Test
+    void storeRollsBackActiveTransactionAfterCommitFailure() {
+        EntityManagerFactory entityManagerFactory = mock(EntityManagerFactory.class);
+        EntityManager entityManager = mock(EntityManager.class);
+        EntityTransaction transaction = mock(EntityTransaction.class);
+        Item item = mock(Item.class);
+
+        when(entityManagerFactory.createEntityManager()).thenReturn(entityManager);
+        when(entityManager.getTransaction()).thenReturn(transaction);
+        when(item.getName()).thenReturn("Kitchen_Persons");
+        when(item.getState()).thenReturn(new DecimalType(1));
+        when(transaction.isActive()).thenReturn(true);
+
+        RuntimeException commitFailure = new RuntimeException("commit failed");
+        org.mockito.Mockito.doThrow(commitFailure).when(transaction).commit();
+
+        JpaPersistenceService service = new TestJpaPersistenceService(entityManagerFactory);
+
+        assertDoesNotThrow(() -> service.store(item));
+
+        verify(transaction).rollback();
+        verify(entityManager).close();
+    }
+
+    private static final class TestJpaPersistenceService extends JpaPersistenceService {
+        private final EntityManagerFactory entityManagerFactory;
+
+        TestJpaPersistenceService(EntityManagerFactory entityManagerFactory) {
+            super(mock(BundleContext.class), validConfig(), mock(ItemRegistry.class));
+            this.entityManagerFactory = entityManagerFactory;
+        }
+
+        @Override
+        protected EntityManagerFactory getEntityManagerFactory() {
+            return entityManagerFactory;
+        }
+    }
+
+    private static Map<String, @Nullable Object> validConfig() {
+        return Map.of("url", "jdbc:derby:memory:test;create=true", "driver", "org.apache.derby.jdbc.EmbeddedDriver");
+    }
+}