Merge pull request #345 from stuartwdouglas/no-local-retry

EJBCLIENT-296 Don't retry local affinity requests
wildfly · Mar 7, 2018 · 8685a38 · 8685a38
2 parents 7cd3dda + c6ca2cd
commit 8685a38
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/org/jboss/ejb/client/DiscoveryEJBClientInterceptor.java b/src/main/java/org/jboss/ejb/client/DiscoveryEJBClientInterceptor.java
@@ -199,10 +199,11 @@ static void setupSessionAffinities(EJBSessionCreationInvocationContext context)
     private void processMissingTarget(final AbstractInvocationContext context) {
         final URI destination = context.getDestination();
 
-        if (destination == null) {
+        if (destination == null || context.getTargetAffinity() == Affinity.LOCAL) {
             // nothing we can/should do.
             return;
         }
+
         // Oops, we got some wrong information!
         addBlackListedDestination(context, destination);
 

diff --git a/src/main/java/org/jboss/ejb/client/NamingEJBClientInterceptor.java b/src/main/java/org/jboss/ejb/client/NamingEJBClientInterceptor.java
@@ -172,7 +172,7 @@ private static List<URI> findPreferredURIs(AbstractInvocationContext context, Li
 
     private void processMissingTarget(final AbstractInvocationContext context) {
         final URI destination = context.getDestination();
-        if (destination == null) {
+        if (destination == null || context.getTargetAffinity() == Affinity.LOCAL) {
             // some later interceptor cleared it out on us
             return;
         }