From af31a13f50548dd8992cc98f6bb97955c5d638ca Mon Sep 17 00:00:00 2001
From: Michael Ranaldo <michael@ranaldo.co.uk>
Date: Tue, 28 Nov 2017 16:48:05 +0000
Subject: [PATCH] PAYARA-2221 Fix recognition of resourceAdapter environment
 variables

---
 .../deployment/annotation/handlers/MessageDrivenHandler.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/deployment/annotation/handlers/MessageDrivenHandler.java b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/deployment/annotation/handlers/MessageDrivenHandler.java
index 6cba4ba380b..6cfdb78f7ee 100644
--- a/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/deployment/annotation/handlers/MessageDrivenHandler.java
+++ b/appserver/ejb/ejb-full-container/src/main/java/org/glassfish/ejb/mdb/deployment/annotation/handlers/MessageDrivenHandler.java
@@ -136,11 +136,12 @@ protected HandlerProcessingResult setEjbDescriptorInfo(
 
         for (ActivationConfigProperty acProp : mdAn.activationConfig()) {
             EnvironmentProperty envProp = new EnvironmentProperty(
-                    acProp.propertyName(), (String) TranslatedConfigView.getTranslatedValue(acProp.propertyValue()), "");
+                    acProp.propertyName(), 
+                    (String) TranslatedConfigView.getTranslatedValue(acProp.propertyValue()), "");
                                                 // with empty description
             // xml override
             if (acProp.propertyName().equals("resourceAdapter")) {
-                ejbMsgBeanDesc.setResourceAdapterMid(acProp.propertyValue());
+                ejbMsgBeanDesc.setResourceAdapterMid(envProp.getValue());
             } else if (ejbMsgBeanDesc.getActivationConfigValue(envProp.getName()) == null) {
                 ejbMsgBeanDesc.putActivationConfigProperty(envProp);
             }