From 0b21daf5a30d8ed97d4467a78118d818ed6a3bd6 Mon Sep 17 00:00:00 2001
From: Claus Ibsen <claus.ibsen@gmail.com>
Date: Sun, 3 Nov 2013 13:40:38 +0100
Subject: [PATCH] AMQ-2960: Fixed potential NPE in pooled connection factory in
 activemq-spring when using spring-dm in OSGi. As spring-dm may call getObject
 before postCostruct has been called.

---
 .../apache/activemq/pool/PooledConnectionFactoryBean.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 afd380f2db..6a9de11093 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
@@ -185,9 +185,12 @@ public class PooledConnectionFactoryBean implements FactoryBean {
         }
     }
 
-    // FactoryBean methods
     @Override
     public Object getObject() throws Exception {
+        // in case spring-dm calls getObject before this bean has been initialized
+        if (pooledConnectionFactory == null) {
+            afterPropertiesSet();
+        }
         return pooledConnectionFactory;
     }