From a1f15f45111aacdde2ff883116d32aa8c14e4adc Mon Sep 17 00:00:00 2001
From: asutosh936 <asutosh.pandya@hotmail.com>
Date: Sat, 3 Mar 2018 13:18:39 -0600
Subject: [PATCH] AMQ-6905 : Upgraded ActivationConfigProperty as per API
 Documentation

---
 .../java/org/apache/activemq/ra/ActiveMQResourceAdapter.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
index b17674e88a..cf0be3ec06 100644
--- a/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
+++ b/activemq-ra/src/main/java/org/apache/activemq/ra/ActiveMQResourceAdapter.java
@@ -129,7 +129,7 @@ public class ActiveMQResourceAdapter extends ActiveMQConnectionSupport implement
         }
         String userName = defaultValue(activationSpec.getUserName(), getInfo().getUserName());
         String password = defaultValue(activationSpec.getPassword(), getInfo().getPassword());
-        String clientId = activationSpec.getClientId();
+        String clientId = defaultValue(activationSpec.getClientId(), getInfo().getClientid());
         if (clientId != null) {
             cf.setClientID(clientId);
         } else {