From 50e49759bc61787b079462ebe159ecd88cfb306b Mon Sep 17 00:00:00 2001
From: "David M. Lloyd" <david.lloyd@redhat.com>
Date: Thu, 2 Feb 2017 17:58:04 -0600
Subject: [PATCH] Update to EJB client 4.0.0.Beta12 (with API usage changes)
 and transaction client 1.0.0.Beta8

---
 .../org/jboss/as/ejb3/remote/EJBClientContextService.java   | 6 ++----
 pom.xml                                                     | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ejb3/src/main/java/org/jboss/as/ejb3/remote/EJBClientContextService.java b/ejb3/src/main/java/org/jboss/as/ejb3/remote/EJBClientContextService.java
index d8e31f6166d0..849b7259e1aa 100644
--- a/ejb3/src/main/java/org/jboss/as/ejb3/remote/EJBClientContextService.java
+++ b/ejb3/src/main/java/org/jboss/as/ejb3/remote/EJBClientContextService.java
@@ -62,7 +62,7 @@ public final class EJBClientContextService implements Service<EJBClientContextSe
      * TODO: possibly move to using a per-thread solution for embedded support
      */
     private final boolean makeGlobal;
-    private long invocationTimeout = -1;
+    private long invocationTimeout;
 
     public EJBClientContextService(final boolean makeGlobal) {
         this.makeGlobal = makeGlobal;
@@ -78,9 +78,7 @@ public void start(final StartContext context) throws StartException {
         // apply subsystem-level configuration that applies to all EJB client contexts
         configuratorServiceInjector.getValue().accept(builder);
 
-        if (invocationTimeout != -1) {
-            builder.setInvocationTimeout(invocationTimeout);
-        }
+        builder.setInvocationTimeout(invocationTimeout);
 
         final EJBTransportProvider localTransport = localProviderInjector.getOptionalValue();
         if (localTransport != null) {
diff --git a/pom.xml b/pom.xml
index 0fcdcd0b863a..4512e181a759 100644
--- a/pom.xml
+++ b/pom.xml
@@ -157,7 +157,7 @@
         <version.org.jboss.activemq.artemis.integration>1.0.2</version.org.jboss.activemq.artemis.integration>
         <version.org.jboss.common.jboss-common-beans>2.0.0.Final</version.org.jboss.common.jboss-common-beans>
         <version.org.jboss.hal.release-stream>2.9.1.Final</version.org.jboss.hal.release-stream>
-        <version.org.jboss.ejb-client>4.0.0.Beta11</version.org.jboss.ejb-client>
+        <version.org.jboss.ejb-client>4.0.0.Beta12</version.org.jboss.ejb-client>
         <version.org.jboss.ejb3.ext-api>2.2.0.Final</version.org.jboss.ejb3.ext-api>
         <version.org.jboss.genericjms>2.0.0.Alpha2</version.org.jboss.genericjms>
         <version.org.jboss.iiop-client>1.0.0.Final</version.org.jboss.iiop-client>
@@ -220,7 +220,7 @@
         <version.org.wildfly.arquillian>2.1.0.Alpha1</version.org.wildfly.arquillian>
         <version.org.wildfly.naming-client>1.0.0.Beta9</version.org.wildfly.naming-client>
         <version.org.wildfly.security.elytron-subsystem>1.0.0.Beta4</version.org.wildfly.security.elytron-subsystem>
-        <version.org.wildfly.transaction.client>1.0.0.Beta7</version.org.wildfly.transaction.client>
+        <version.org.wildfly.transaction.client>1.0.0.Beta8</version.org.wildfly.transaction.client>
         <version.org.yaml.snakeyaml>1.17</version.org.yaml.snakeyaml>
         <version.sun.jaxb>2.2.11.jbossorg-1</version.sun.jaxb>
         <version.sun.saaj-impl>1.3.16-jbossorg-1</version.sun.saaj-impl>