From 15fa4afe9837b48116b1c5d5bc4bc84e0cdc3f30 Mon Sep 17 00:00:00 2001
From: Dmitrii Tikhomirov <dtikhomi@redhat.com>
Date: Thu, 28 Jan 2016 16:47:44 +0100
Subject: [PATCH] [WFLY-6048] jboss-webservices.xml descriptor doesn't override
 @WebContext annotation

---
 .../as/webservices/metadata/AbstractMetaDataBuilderEJB.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webservices/server-integration/src/main/java/org/jboss/as/webservices/metadata/AbstractMetaDataBuilderEJB.java b/webservices/server-integration/src/main/java/org/jboss/as/webservices/metadata/AbstractMetaDataBuilderEJB.java
index f543fbf86ce3..9991cb1b41bd 100644
--- a/webservices/server-integration/src/main/java/org/jboss/as/webservices/metadata/AbstractMetaDataBuilderEJB.java
+++ b/webservices/server-integration/src/main/java/org/jboss/as/webservices/metadata/AbstractMetaDataBuilderEJB.java
@@ -159,8 +159,8 @@ private static String getAuthMethod(final EJBEndpoint ejbEndpoint, final JBossPo
     }
 
     private static String getTransportGuarantee(final EJBEndpoint ejbEndpoint, final JBossPortComponentMetaData portComponentMD) {
-        if (ejbEndpoint.getTransportGuarantee() != null) return ejbEndpoint.getTransportGuarantee();
-        return portComponentMD != null ? portComponentMD.getTransportGuarantee() : null;
+        if (portComponentMD != null && portComponentMD.getTransportGuarantee() != null) return portComponentMD.getTransportGuarantee();
+        return ejbEndpoint != null ? ejbEndpoint.getTransportGuarantee() : null;
     }
 
     private static boolean isSecureWsdlAccess(final EJBEndpoint ejbEndpoint, final JBossPortComponentMetaData portComponentMD) {