[hornetq-commits] JBoss hornetq SVN: r8106 - in branches/hornetq_grouping: src/main/org/hornetq/core/server/cluster/impl and 3 other directories.

[do-not-reply at jboss.org]

Author: ataylor
Date: 2009-10-14 06:27:45 -0400 (Wed, 14 Oct 2009)
New Revision: 8106

Modified:
   branches/hornetq_grouping/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java
   branches/hornetq_grouping/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
   branches/hornetq_grouping/src/main/org/hornetq/core/server/group/GroupingHandler.java
   branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/LocalGroupingHandler.java
   branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java
   branches/hornetq_grouping/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
Log:
fixes

Modified: branches/hornetq_grouping/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java
===================================================================
--- branches/hornetq_grouping/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java	2009-10-14 10:13:49 UTC (rev 8105)
+++ branches/hornetq_grouping/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java	2009-10-14 10:27:45 UTC (rev 8106)
@@ -462,12 +462,12 @@
 
             resp = groupingGroupingHandler.propose(new Proposal(fullID, chosen.getClusterName()));
 
-            if (!resp.getChosen().equals(chosen.getClusterName()))
+            if (resp.getAlternative() != null)
             {
                chosen = null;
                for (Binding binding : bindings)
                {
-                  if (binding.getClusterName().equals(resp.getChosen()))
+                  if (binding.getClusterName().equals(resp.getAlternative()))
                   {
                      chosen = binding;
                      break;

Modified: branches/hornetq_grouping/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- branches/hornetq_grouping/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java	2009-10-14 10:13:49 UTC (rev 8105)
+++ branches/hornetq_grouping/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java	2009-10-14 10:27:45 UTC (rev 8106)
@@ -491,7 +491,7 @@
       GroupingHandler groupingHandler;
       if (config.getType() == GroupingHandlerConfiguration.TYPE.LOCAL)
       {
-         groupingHandler = new LocalGroupingHandler(managementService, config.getName(), config.getAddress(), scheduledExecutor);
+         groupingHandler = new LocalGroupingHandler(managementService, config.getName(), config.getAddress());
       }
       else
       {

Modified: branches/hornetq_grouping/src/main/org/hornetq/core/server/group/GroupingHandler.java
===================================================================
--- branches/hornetq_grouping/src/main/org/hornetq/core/server/group/GroupingHandler.java	2009-10-14 10:13:49 UTC (rev 8105)
+++ branches/hornetq_grouping/src/main/org/hornetq/core/server/group/GroupingHandler.java	2009-10-14 10:27:45 UTC (rev 8106)
@@ -30,6 +30,4 @@
    void send(Response response, int distance) throws Exception;
 
    Response receive(Proposal proposal, int distance) throws Exception;
-
-   Response rePropose(Proposal proposal) throws Exception;
 }

Modified: branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/LocalGroupingHandler.java
===================================================================
--- branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/LocalGroupingHandler.java	2009-10-14 10:13:49 UTC (rev 8105)
+++ branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/LocalGroupingHandler.java	2009-10-14 10:27:45 UTC (rev 8106)
@@ -42,16 +42,11 @@
 
    private SimpleString address;
 
-   private ScheduledExecutorService scheduledExecutor;
-
-   private ConcurrentHashSet<SimpleString> reProposals = new ConcurrentHashSet<SimpleString>();
-
-   public LocalGroupingHandler(final ManagementService managementService, final SimpleString name, final SimpleString address, ScheduledExecutorService scheduledExecutor)
+   public LocalGroupingHandler(final ManagementService managementService, final SimpleString name, final SimpleString address)
    {
       this.managementService = managementService;
       this.name = name;
       this.address = address;
-      this.scheduledExecutor = scheduledExecutor;
    }
 
    public SimpleString getName()
@@ -84,7 +79,6 @@
 
    public void send(Response response, int distance) throws Exception
    {
-      Object value = response.getAlternative() != null ? response.getAlternative() : response.getOriginal();
       TypedProperties props = new TypedProperties();
       props.putStringProperty(ManagementHelper.HDR_PROPOSAL_TYPE, response.getResponseType());
       props.putStringProperty(ManagementHelper.HDR_PROPOSAL_VALUE, (SimpleString)response.getOriginal());
@@ -100,27 +94,5 @@
    {
       return propose(proposal);
    }
-
-   public Response rePropose(final Proposal proposal) throws Exception
-   {
-      if(reProposals.addIfAbsent(proposal.getProposalType()))
-      {
-         Response response = new Response(proposal.getProposalType(), proposal.getProposal());
-         map.replace(proposal.getProposalType(), response);
-         send(response, 0);
-         scheduledExecutor.schedule(new Runnable()
-         {
-            public void run()
-            {
-               reProposals.remove(proposal.getProposalType());
-            }
-         }, 2000, TimeUnit.MILLISECONDS);
-         return response;
-      }
-      else
-      {
-         return new Response(proposal.getProposalType(), map.get(proposal.getProposalType()));
-      }
-   }
 }
 

Modified: branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java
===================================================================
--- branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java	2009-10-14 10:13:49 UTC (rev 8105)
+++ branches/hornetq_grouping/src/main/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java	2009-10-14 10:27:45 UTC (rev 8106)
@@ -100,7 +100,6 @@
 
    public void proposed(Response response) throws Exception
    {
-      Object value = response.getAlternative() != null ? response.getAlternative() : response.getOriginal();
       try
       {
          lock.lock();
@@ -130,10 +129,5 @@
    {
    }
 
-   public Response rePropose(Proposal proposal)
-   {
-      return null;
-   }
-
 }
 

Modified: branches/hornetq_grouping/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- branches/hornetq_grouping/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java	2009-10-14 10:13:49 UTC (rev 8105)
+++ branches/hornetq_grouping/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java	2009-10-14 10:27:45 UTC (rev 8106)
@@ -458,7 +458,7 @@
       GroupingHandler groupingHandler;
       if(type == GroupingHandlerConfiguration.TYPE.LOCAL)
       {
-         groupingHandler = new LocalGroupingHandler(servers[node].getManagementService(), new SimpleString("grouparbitrator"), new SimpleString("queues"), null);
+         groupingHandler = new LocalGroupingHandler(servers[node].getManagementService(), new SimpleString("grouparbitrator"), new SimpleString("queues"));
       }
       else
       {