ISPN-5038 Remote package refactor

* fixed performance issue (put missing dont bundle flag)
infinispan · Dec 16, 2014 · 6925071 · 6925071 · infinispanrelease · Dec 16, 2014
1 parent 06cbd55
commit 6925071
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java b/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java
@@ -343,7 +343,7 @@ protected static Message constructMessage(Buffer buf, Address recipient,Response
       msg.setBuffer(buf);
       encodeDeliverMode(msg, deliverOrder);
       //some issues with the new bundler. put back the DONT_BUNDLE flag.
-      if (mode != ResponseMode.GET_NONE) msg.setFlag(Message.Flag.DONT_BUNDLE);
+      if (deliverOrder == DeliverOrder.NONE || mode != ResponseMode.GET_NONE) msg.setFlag(Message.Flag.DONT_BUNDLE);
       if (rsvp) msg.setFlag(Message.Flag.RSVP);
 
       if (recipient != null) msg.setDest(recipient);

diff --git a/core/src/main/java/org/infinispan/topology/ClusterTopologyManagerImpl.java b/core/src/main/java/org/infinispan/topology/ClusterTopologyManagerImpl.java
@@ -110,7 +110,7 @@ public void start() {
          Map<Address, Response> responseMap = null;
          try {
             responseMap = transport.invokeRemotely(Collections.singleton(coordinator),
-                  command, ResponseMode.SYNCHRONOUS, getGlobalTimeout(), true, null, false, false);
+                  command, ResponseMode.SYNCHRONOUS, getGlobalTimeout(), null, DeliverOrder.NONE, false);
             Response response = responseMap.get(coordinator);
             if (response instanceof SuccessfulResponse) {
                isRebalancingEnabled = ((Boolean) ((SuccessfulResponse) response).getResponseValue());