[EJBCLIENT-262] Fix assertion issue

wildfly · Sep 12, 2017 · 4ae9441 · 4ae9441
1 parent 179af90
commit 4ae9441
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 11 deletions.
diff --git a/src/main/java/org/jboss/ejb/client/DiscoveryEJBClientInterceptor.java b/src/main/java/org/jboss/ejb/client/DiscoveryEJBClientInterceptor.java
@@ -81,6 +81,11 @@ public DiscoveryEJBClientInterceptor() {
     }
 
     public void handleInvocation(final EJBClientInvocationContext context) throws Exception {
+        if (context.getDestination() != null) {
+            // already discovered!
+            context.sendRequest();
+            return;
+        }
         List<Throwable> problems = executeDiscovery(context);
         try {
             context.sendRequest();
@@ -131,6 +136,10 @@ public Object handleInvocationResult(final EJBClientInvocationContext context) t
     }
 
     public SessionID handleSessionCreation(final EJBSessionCreationInvocationContext context) throws Exception {
+        if (context.getDestination() != null) {
+            // already discovered!
+            return context.proceed();
+        }
         List<Throwable> problems = executeDiscovery(context);
         SessionID sessionID;
         try {
@@ -222,10 +231,7 @@ Discovery getDiscovery() {
     }
 
     private List<Throwable> executeDiscovery(AbstractInvocationContext context) {
-        if (context.getDestination() != null) {
-            // Someone else discovered already!
-            return null;
-        }
+        assert context.getDestination() == null;
         final EJBLocator<?> locator = context.getLocator();
         final Affinity affinity = locator.getAffinity();
         final Affinity weakAffinity = context.getWeakAffinity();

diff --git a/src/main/java/org/jboss/ejb/client/NamingEJBClientInterceptor.java b/src/main/java/org/jboss/ejb/client/NamingEJBClientInterceptor.java
@@ -44,12 +44,15 @@ public final class NamingEJBClientInterceptor implements EJBClientInterceptor {
      */
     public static final int PRIORITY = ClientInterceptorPriority.JBOSS_AFTER + 50;
 
+    private static final AttachmentKey<Boolean> SKIP_MISSING_TARGET = new AttachmentKey<>();
+
     public NamingEJBClientInterceptor() {
     }
 
     public void handleInvocation(final EJBClientInvocationContext context) throws Exception {
         final NamingProvider namingProvider = context.getProxyAttachment(EJBRootContext.NAMING_PROVIDER_ATTACHMENT_KEY);
-        if (namingProvider == null) {
+        if (namingProvider == null || context.getDestination() != null) {
+            context.putAttachment(SKIP_MISSING_TARGET, Boolean.TRUE);
             context.sendRequest();
         } else {
             if (setDestination(context, namingProvider)) try {
@@ -67,14 +70,18 @@ public Object handleInvocationResult(final EJBClientInvocationContext context) t
         try {
             return context.getResult();
         } catch (NoSuchEJBException | RequestSendFailedException e) {
-            processMissingTarget(context);
+            if (context.getAttachment(SKIP_MISSING_TARGET) != Boolean.TRUE) {
+                processMissingTarget(context);
+            }
             throw e;
+        } finally {
+            context.removeAttachment(SKIP_MISSING_TARGET);
         }
     }
 
     public SessionID handleSessionCreation(final EJBSessionCreationInvocationContext context) throws Exception {
         final NamingProvider namingProvider = context.getAttachment(EJBRootContext.NAMING_PROVIDER_ATTACHMENT_KEY);
-        if (namingProvider == null) {
+        if (namingProvider == null || context.getDestination() != null) {
             return context.proceed();
         } else {
             if (setDestination(context, namingProvider)) try {
@@ -123,11 +130,8 @@ private static boolean setDestination(final AbstractInvocationContext context, f
 
     private void processMissingTarget(final AbstractInvocationContext context) {
         final URI destination = context.getDestination();
+        assert destination != null;
 
-        if (destination == null) {
-            // nothing we can/should do.
-            return;
-        }
         // Oops, we got some wrong information!
         addBlackListedDestination(context, destination);