This is an automated email from the git hooks/post-receive script. apo-guest pushed a commit to branch master in repository activemq.
commit e430df04c15079828ee7fea5cc3ca433da49e764 Author: Markus Koschany <[email protected]> Date: Sat Mar 19 16:46:46 2016 +0100 Update activemq-spring.patch --- debian/patches/activemq-spring.patch | 42 ++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/debian/patches/activemq-spring.patch b/debian/patches/activemq-spring.patch index ac155b7..d48a323 100644 --- a/debian/patches/activemq-spring.patch +++ b/debian/patches/activemq-spring.patch @@ -3,10 +3,10 @@ Date: Sat, 19 Mar 2016 16:36:23 +0100 Subject: activemq-spring --- - .../org/apache/activemq/hooks/osgi/SpringOsgiContextHook.java | 6 +++--- - .../org/apache/activemq/pool/PooledConnectionFactoryBean.java | 8 ++++---- - .../org/apache/activemq/store/PersistenceAdapterFactoryBean.java | 4 ++-- - 3 files changed, 9 insertions(+), 9 deletions(-) + .../org/apache/activemq/hooks/osgi/SpringOsgiContextHook.java | 6 +++--- + .../org/apache/activemq/pool/PooledConnectionFactoryBean.java | 9 ++++----- + .../org/apache/activemq/store/PersistenceAdapterFactoryBean.java | 5 ++--- + 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/activemq-spring/src/main/java/org/apache/activemq/hooks/osgi/SpringOsgiContextHook.java b/activemq-spring/src/main/java/org/apache/activemq/hooks/osgi/SpringOsgiContextHook.java index 45c7bec..7fe0427 100644 @@ -38,7 +38,7 @@ index 45c7bec..7fe0427 100644 } diff --git a/activemq-spring/src/main/java/org/apache/activemq/pool/PooledConnectionFactoryBean.java b/activemq-spring/src/main/java/org/apache/activemq/pool/PooledConnectionFactoryBean.java -index 6a9de11..0c89ffc 100644 +index 6a9de11..54dd496 100644 --- a/activemq-spring/src/main/java/org/apache/activemq/pool/PooledConnectionFactoryBean.java +++ b/activemq-spring/src/main/java/org/apache/activemq/pool/PooledConnectionFactoryBean.java @@ -20,7 +20,7 @@ import javax.annotation.PostConstruct; @@ -68,17 +68,25 @@ index 6a9de11..0c89ffc 100644 try { LOGGER.debug("Trying to build a JcaPooledConnectionFactory"); JcaPooledConnectionFactory f = new JcaPooledConnectionFactory(); -@@ -128,7 +128,7 @@ public class PooledConnectionFactoryBean implements FactoryBean { - } catch (Throwable t) { - LOGGER.debug("Could not create JCA enabled connection factory: " + t, t); - } +@@ -156,7 +156,7 @@ public class PooledConnectionFactoryBean implements FactoryBean { + } + if (pooledConnectionFactory == null) { + throw new IllegalStateException("Unable to create pooled connection factory. Enable DEBUG log level for more informations"); - } + }*/ - if (pooledConnectionFactory == null && transactionManager != null) { - try { - LOGGER.debug("Trying to build a XaPooledConnectionFactory"); + } + + /** +@@ -180,7 +180,6 @@ public class PooledConnectionFactoryBean implements FactoryBean { + */ + public void destroy() throws Exception { + if (pooledConnectionFactory != null) { +- pooledConnectionFactory.stop(); + pooledConnectionFactory = null; + } + } diff --git a/activemq-spring/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java b/activemq-spring/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java -index 0964024..8ace6d4 100644 +index 0964024..431ae92 100644 --- a/activemq-spring/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java +++ b/activemq-spring/src/main/java/org/apache/activemq/store/PersistenceAdapterFactoryBean.java @@ -16,7 +16,7 @@ @@ -90,7 +98,7 @@ index 0964024..8ace6d4 100644 import org.springframework.beans.factory.FactoryBean; /** -@@ -26,7 +26,7 @@ import org.springframework.beans.factory.FactoryBean; +@@ -26,13 +26,12 @@ import org.springframework.beans.factory.FactoryBean; * * */ @@ -99,3 +107,9 @@ index 0964024..8ace6d4 100644 private PersistenceAdapter persistenceAdaptor; + public Object getObject() throws Exception { + if (persistenceAdaptor == null) { +- persistenceAdaptor = createPersistenceAdapter(); + } + return persistenceAdaptor; + } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/activemq.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
