From 604386ae5039c953be41d000af69964c7a827121 Mon Sep 17 00:00:00 2001
From: Jesse White <jesse@opennms.com>
Date: Tue, 23 May 2023 21:01:15 -0400
Subject: [PATCH] NMS-15696: Remove @Transactional annotation from
 JdbcFilterDao in order to help avoid database connection related deadlocks.

This class does not Spring/Hibernate which means that connections
are acquired but left idle.
---
 .../main/java/org/opennms/netmgt/filter/JdbcFilterDao.java    | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/opennms-config/src/main/java/org/opennms/netmgt/filter/JdbcFilterDao.java b/opennms-config/src/main/java/org/opennms/netmgt/filter/JdbcFilterDao.java
index b285abb8a86a..396aaf4eb805 100644
--- a/opennms-config/src/main/java/org/opennms/netmgt/filter/JdbcFilterDao.java
+++ b/opennms-config/src/main/java/org/opennms/netmgt/filter/JdbcFilterDao.java
@@ -62,8 +62,6 @@
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Assert;
 
 import com.codahale.metrics.JmxReporter;
@@ -76,7 +74,6 @@
  * @author <a href="mailto:dj@opennms.org">DJ Gregor</a>
  * @version $Id: $
  */
-@Transactional
 public class JdbcFilterDao implements FilterDao, InitializingBean {
     private static final Logger LOG = LoggerFactory.getLogger(JdbcFilterDao.class);
     private static final Pattern SQL_KEYWORD_PATTERN = Pattern.compile("\\s+(?:AND|OR|(?:NOT )?(?:LIKE|IN)|IS (?:NOT )?DISTINCT FROM)\\s+|(?:\\s+IS (?:NOT )?NULL|::(?:TIMESTAMP|INET))(?!\\w)|(?<!\\w)(?:NOT\\s+|IPLIKE(?=\\())", Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE);
@@ -146,7 +143,6 @@ public void afterPropertiesSet() {
     }
 
     @PreDestroy
-    @Transactional(propagation = Propagation.NOT_SUPPORTED)
     public void destroy() throws Exception {
         if (jmxReporter != null) {
             jmxReporter.stop();