Stop spamming the logs with warnings about sending requests to oursel…

…ves for pending requests.
tetrapods · Jul 28, 2015 · c9c1afc · c9c1afc
1 parent 41b5e0f
commit c9c1afc
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/Tetrapod-Core/src/io/tetrapod/core/ServiceConnector.java b/Tetrapod-Core/src/io/tetrapod/core/ServiceConnector.java
@@ -188,12 +188,14 @@ public DirectServiceInfo getDirectServiceInfo(int entityId) {
       }
    }
 
-   private Session getSession(Request req, int entityId) {
+   private Session getSession(Request req, int entityId, boolean isPending) {
       if (entityId != Core.DIRECT) {
 
          if (entityId != Core.UNADDRESSED) {
             if (entityId == service.getEntityId()) {
-               logger.warn("For some reason we're sending {} to ourselves", req);
+               if (!isPending) {
+                  logger.warn("For some reason we're sending {} to ourselves", req);                  
+               }
             } else {
                final DirectServiceInfo s = getDirectServiceInfo(entityId);
                synchronized (s) {
@@ -227,7 +229,7 @@ public Response sendPendingRequest(final Request req, int toEntityId, final Pend
          }
       }
 
-      final Session ses = handler.session != null ? getSession(req, toEntityId) : service.clusterClient.getSession();
+      final Session ses = handler.session != null ? getSession(req, toEntityId, true) : service.clusterClient.getSession();
       if (ses != service.clusterClient.getSession()) {
          logger.debug("Dispatching pending {} to {} returning on {}", req, ses, handler.session);
          final Async async = ses.sendRequest(req, toEntityId, (byte) 30);
@@ -279,7 +281,7 @@ public Async sendRequest(Request req, int toEntityId) {
          return service.dispatchRequest(header, req, null);
       }
 
-      final Session ses = getSession(req, toEntityId);
+      final Session ses = getSession(req, toEntityId, false);
       return ses.sendRequest(req, toEntityId, (byte) 30);
    }