1 files changed, 13 insertions, 35 deletions
diff --git a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAProperties.java b/java/jca/src/main/java/org/apache/qpid/ra/QpidRAProperties.java
index 21f7d2574f..69320575b0 100644
--- a/java/jca/src/main/java/org/apache/qpid/ra/QpidRAProperties.java
+++ b/java/jca/src/main/java/org/apache/qpid/ra/QpidRAProperties.java
@@ -31,10 +31,8 @@ import org.slf4j.LoggerFactory;
  */
 public class QpidRAProperties extends ConnectionFactoryProperties implements Serializable
 {
-   /** Serial version UID */
    private static final long serialVersionUID = -4823893873707374791L;
 
-   /** The logger */
    private static final Logger _log = LoggerFactory.getLogger(QpidRAProperties.class);
 
    private static final int DEFAULT_SETUP_ATTEMPTS = 10;
@@ -45,16 +43,14 @@ public class QpidRAProperties extends ConnectionFactoryProperties implements Ser
 
    private long _setupInterval = DEFAULT_SETUP_INTERVAL;
 
-   /** Use Local TX instead of XA */
-   private Boolean _localTx = false;
-
    /** Class used to locate the Transaction Manager. */
    private String _transactionManagerLocatorClass ;
 
    /** Method used to locate the TM */
    private String _transactionManagerLocatorMethod ;
 
-
+   private boolean _useConnectionPerHandler = true;
+   
    /**
     * Constructor
     */
@@ -66,34 +62,6 @@ public class QpidRAProperties extends ConnectionFactoryProperties implements Ser
       }
    }
 
-   /**
-    * Get the use XA flag
-    * @return The value
-    */
-   public Boolean getUseLocalTx()
-   {
-      if (_log.isTraceEnabled())
-      {
-         _log.trace("getUseLocalTx()");
-      }
-
-      return _localTx;
-   }
-
-   /**
-    * Set the use XA flag
-    * @param localTx The value
-    */
-   public void setUseLocalTx(final Boolean localTx)
-   {
-      if (_log.isTraceEnabled())
-      {
-         _log.trace("setUseLocalTx(" + localTx + ")");
-      }
-
-      this._localTx = localTx;
-   }
-
    public void setTransactionManagerLocatorClass(final String transactionManagerLocatorClass)
    {
       if (_log.isTraceEnabled())
@@ -174,10 +142,20 @@ public class QpidRAProperties extends ConnectionFactoryProperties implements Ser
       this._setupInterval = setupInterval;
    }
 
+   public boolean isUseConnectionPerHandler()
+   {
+       return _useConnectionPerHandler;
+   }
+   
+   public void setUseConnectionPerHandler(boolean connectionPerHandler)
+   {
+       this._useConnectionPerHandler = connectionPerHandler;                       
+   }
+   
    @Override
    public String toString()
    {
-      return "QpidRAProperties[localTx=" + _localTx +
+      return "QpidRAProperties[" +
             ", transactionManagerLocatorClass=" + _transactionManagerLocatorClass +
             ", transactionManagerLocatorMethod=" + _transactionManagerLocatorMethod +
             ", setupAttempts=" + _setupAttempts +