Merge pull request #261 from TomasHofman/EJBCLIENT-218

EJBCLIENT-218 Propagate invocation.timeout setting from legacy proper…
wildfly · Apr 28, 2017 · 44466fa · 44466fa
2 parents 5ad49bc + 3993c60
commit 44466fa
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/main/java/org/jboss/ejb/client/EJBRootContext.java b/src/main/java/org/jboss/ejb/client/EJBRootContext.java
@@ -21,6 +21,7 @@
 import java.net.URI;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
+import java.util.concurrent.TimeUnit;
 
 import javax.naming.Binding;
 import javax.naming.Name;
@@ -38,6 +39,9 @@
 import org.wildfly.security.auth.client.AuthenticationConfiguration;
 
 class EJBRootContext extends AbstractContext {
+
+    private static final String PROPERTY_KEY_INVOCATION_TIMEOUT = "invocation.timeout";
+
     private final Affinity affinity;
     private final NamingProvider namingProvider;
 
@@ -149,7 +153,15 @@ protected Object lookupNative(final Name name) throws NamingException {
         } else {
             locator = StatelessEJBLocator.create(view, identifier, affinity);
         }
-        return EJBClient.createProxy(locator, authenticationConfiguration, sslContext);
+        Object proxy = EJBClient.createProxy(locator, authenticationConfiguration, sslContext);
+
+        // if "invocation.timeout" is set in environment properties, set this value to created proxy
+        Long invocationTimeout = getLongValueFromEnvironment(PROPERTY_KEY_INVOCATION_TIMEOUT);
+        if (invocationTimeout != null) {
+            EJBClient.setInvocationTimeout(proxy, invocationTimeout, TimeUnit.MILLISECONDS);
+        }
+
+        return proxy;
     }
 
     private static ClassLoader getContextClassLoader(){
@@ -185,4 +197,12 @@ public void close() throws NamingException {
     public String getNameInNamespace() throws NamingException {
         return "";
     }
+
+    private Long getLongValueFromEnvironment(String key) throws NamingException {
+        Object val = getEnvironment().get(key);
+        if (val != null && val instanceof String) {
+            return Long.parseLong((String) val);
+        }
+        return null;
+    }
 }
diff --git a/src/main/java/org/jboss/ejb/client/legacy/LegacyPropertiesConfiguration.java b/src/main/java/org/jboss/ejb/client/legacy/LegacyPropertiesConfiguration.java
@@ -71,6 +71,10 @@ public static void configure(final EJBClientContext.Builder builder) {
                 }
                 builder.setDeploymentNodeSelector(deploymentNodeSelector);
             }
+
+            if (properties.getInvocationTimeout() != -1L) {
+                builder.setInvocationTimeout(properties.getInvocationTimeout());
+            }
         }
     }
 }