[infinispan-commits] Infinispan SVN: r949 - in trunk/core/src: test/resources/stacks and 1 other directory.

[infinispan-commits at lists.jboss.org]

Author: vblagojevic at jboss.com
Date: 2009-10-14 23:04:13 -0400 (Wed, 14 Oct 2009)
New Revision: 949

Modified:
   trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java
   trunk/core/src/test/resources/stacks/tcp.xml
   trunk/core/src/test/resources/stacks/udp.xml
Log:
revert http://fisheye.jboss.org/changelog/Infinispan/?cs=948

Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java	2009-10-14 19:18:39 UTC (rev 948)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java	2009-10-15 03:04:13 UTC (rev 949)
@@ -224,18 +224,11 @@
          if (oob) msg.setFlag(Message.OOB);
          // Replay capability requires responses from all members!
          int mode = supportReplay ? GroupRequest.GET_ALL : this.mode;
-
+ 
          // if there is a JOIN in progress, wait for this to complete.
          // See ISPN-83 for more details.  Once ISPN-83 is addressed, this may no longer be needed.
          distributedSync.blockUntilNoJoinsInProgress();
-         
-         //Use JGroups 2.8 feature Message.DONT_BUNDLE flag to override message bundling at the transport level
-         //for asynchronous calls
-         //See ISPN-192 for more details
-         if (mode == GroupRequest.GET_NONE) {
-            msg.setFlag(Message.DONT_BUNDLE);
-         }
-         
+
          RspList retval = castMessage(dests, msg, mode, timeout, anycasting, filter);
          if (trace) log.trace("responses: {0}", retval);
 

Modified: trunk/core/src/test/resources/stacks/tcp.xml
===================================================================
--- trunk/core/src/test/resources/stacks/tcp.xml	2009-10-14 19:18:39 UTC (rev 948)
+++ trunk/core/src/test/resources/stacks/tcp.xml	2009-10-15 03:04:13 UTC (rev 949)
@@ -9,12 +9,12 @@
         discard_incompatible_packets="true"
         max_bundle_size="64000"
         max_bundle_timeout="30"
-        enable_bundling="true"
+        enable_bundling="false"
         use_send_queues="false"
         sock_conn_timeout="300"
         enable_diagnostics="false"
         skip_suspected_members="true"
-
+ 
         thread_pool.enabled="true"
         thread_pool.min_threads="1"
         thread_pool.max_threads="25"

Modified: trunk/core/src/test/resources/stacks/udp.xml
===================================================================
--- trunk/core/src/test/resources/stacks/udp.xml	2009-10-14 19:18:39 UTC (rev 948)
+++ trunk/core/src/test/resources/stacks/udp.xml	2009-10-15 03:04:13 UTC (rev 949)
@@ -13,10 +13,10 @@
          discard_incompatible_packets="true"
          max_bundle_size="64000"
          max_bundle_timeout="30"
-         ip_ttl="${jgroups.udp.ip_ttl:2}"
-         enable_bundling="true"
+         ip_ttl="${jgroups.udp.ip_ttl:0}"
+         enable_bundling="false"
          enable_diagnostics="false"
-
+ 
          thread_naming_pattern="pl"
 
          thread_pool.enabled="true"