[jboss-cvs] JBossAS SVN: r87442 - in trunk/cluster/src/main/org/jboss/ha: jndi and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2009-04-16 12:31:31 -0400 (Thu, 16 Apr 2009)
New Revision: 87442

Added:
   trunk/cluster/src/main/org/jboss/ha/jndi/LookupSucceededFilter.java
Modified:
   trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
   trunk/cluster/src/main/org/jboss/ha/jndi/HAJNDI.java
Log:
[JBAS-5703] Implemented wait for first positive response filter and integrated it with HAJNDI.

Modified: trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java	2009-04-16 15:52:23 UTC (rev 87441)
+++ trunk/cluster/src/main/org/jboss/ha/framework/server/ClusterPartition.java	2009-04-16 16:31:31 UTC (rev 87442)
@@ -126,7 +126,7 @@
    /**
     * Returned when an RPC call arrives for a service that isn't registered.
     */
-   private static class NoHandlerForRPC implements Serializable
+   public static class NoHandlerForRPC implements Serializable
    {
       static final long serialVersionUID = -1263095408483622838L;
    }

Modified: trunk/cluster/src/main/org/jboss/ha/jndi/HAJNDI.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/jndi/HAJNDI.java	2009-04-16 15:52:23 UTC (rev 87441)
+++ trunk/cluster/src/main/org/jboss/ha/jndi/HAJNDI.java	2009-04-16 16:31:31 UTC (rev 87442)
@@ -244,7 +244,7 @@
          {
             log.trace("calling lookupLocally(" + name + ") on HAJNDI cluster");
          }
-         rsp = this.partition.callMethodOnCluster("HAJNDI", "lookupLocally", args, new Class[] { Name.class }, true);
+         rsp = this.partition.callMethodOnCluster("HAJNDI", "lookupLocally", args, new Class[] { Name.class }, true, new LookupSucceededFilter());
       }
       catch (Exception ignored)
       {

Added: trunk/cluster/src/main/org/jboss/ha/jndi/LookupSucceededFilter.java
===================================================================
--- trunk/cluster/src/main/org/jboss/ha/jndi/LookupSucceededFilter.java	                        (rev 0)
+++ trunk/cluster/src/main/org/jboss/ha/jndi/LookupSucceededFilter.java	2009-04-16 16:31:31 UTC (rev 87442)
@@ -0,0 +1,63 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.ha.jndi;
+
+import org.jboss.ha.framework.interfaces.ClusterNode;
+import org.jboss.ha.framework.interfaces.ResponseFilter;
+import org.jboss.ha.framework.server.ClusterPartition.NoHandlerForRPC;
+import org.jboss.logging.Logger;
+
+/**
+ * This is a response filter that will stop waiting for responses as soon as it has received a 
+ * response that's neither null, nor Exception, nor NoHandlerForRPC. This allows for example 
+ * HAJNDI calls to return as soon as cluster wide lookup has succeeded in a node.
+ * 
+ * @author Galder Zamarreño
+ */
+public class LookupSucceededFilter implements ResponseFilter
+{
+   private static final Logger log = Logger.getLogger(LookupSucceededFilter.class);
+   private static final boolean trace = log.isTraceEnabled();
+   private boolean lookupSucceeded;
+
+   public boolean isAcceptable(Object response, ClusterNode sender)
+   {
+      if (trace)
+      {
+         log.trace("isAcceptable (" + response + ") from " + sender);
+      }
+      
+      lookupSucceeded = (response != null) && !(response instanceof Exception) && !(response instanceof NoHandlerForRPC);
+      
+      if (trace && lookupSucceeded)
+      {
+         log.trace("Lookup succeded from " + sender);
+      }
+      
+      return true;
+   }
+
+   public boolean needMoreResponses()
+   {
+      return !(lookupSucceeded);
+   }
+}