Merge pull request #8658 from treblereel/WFLY-6048

[WFLY-6048] jboss-webservices.xml descriptor doesn't override @webcon…
wildfly · Jun 3, 2016 · 50df8f0 · 50df8f0
2 parents ed944ad + 15fa4af
commit 50df8f0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...tegration/src/main/java/org/jboss/as/webservices/metadata/AbstractMetaDataBuilderEJB.java b/...tegration/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) {