Author: jfrederic.clere(a)jboss.com Date: 2008-09-17 09:00:49 -0400 (Wed, 17 Sep 2008) New Revision: 1847 Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/ModClusterService.java trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/ClusteredMCMPHandlerImpl.java trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/rpc/ClusteredMCMPHandlerRpcHandler.java Log: Finish arrange the getProxyInfo() logic. Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/ModClusterService.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/ModClusterService.java 2008-09-17 12:58:10 UTC (rev 1846) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/ModClusterService.java 2008-09-17 13:00:49 UTC (rev 1847) @@ -818,6 +818,19 @@ } /** + * @see org.jboss.modcluster.ha.rpc.ClusteredMCMPHandlerRpcHandler#getProxyInfo() + */ + public GroupRpcResponse getProxyInfo() + { + if (!this.coord.isMasterNode()) return null; + + ClusterNode node = ModClusterService.this.getHAPartition().getClusterNode(); + String info = this.coord.localHandler.getProxyInfo(); + + return new StringGroupRpcResponse(node, info); + } + + /** * @see org.jboss.modcluster.ha.rpc.ClusteredMCMPHandlerRpcHandler#isProxyHealthOK() */ public GroupRpcResponse isProxyHealthOK() Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/ClusteredMCMPHandlerImpl.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/ClusteredMCMPHandlerImpl.java 2008-09-17 12:58:10 UTC (rev 1846) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/ClusteredMCMPHandlerImpl.java 2008-09-17 13:00:49 UTC (rev 1847) @@ -293,6 +293,20 @@ return ((StringGroupRpcResponse) response).getValue(); } + public String getProxyInfo() + { + if (this.singleton.isMasterNode()) + { + return this.localHandler.getProxyInfo(); + } + + GroupRpcResponse response = this.rpcStub.getProxyInfo(); + + this.validateResponse(response, false); + + return ((StringGroupRpcResponse) response).getValue(); + } + public void init(List<AddressPort> initialProxies) { if (this.singleton.isMasterNode()) @@ -448,6 +462,14 @@ } /** + * @see org.jboss.modcluster.ha.rpc.ClusteredMCMPHandlerRpcHandler#getProxyInfo() + */ + public GroupRpcResponse getProxyInfo() + { + return this.invokeRpc("getProxyInfo"); + } + + /** * @see org.jboss.modcluster.ha.rpc.ClusteredMCMPHandlerRpcHandler#isProxyHealthOK() */ public GroupRpcResponse isProxyHealthOK() @@ -557,4 +579,4 @@ throw new IllegalStateException(ClusteredMCMPHandlerImpl.this.sm.getString("modcluster.error.rpc.noresp", methodName)); } } -} \ No newline at end of file +} Modified: trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/rpc/ClusteredMCMPHandlerRpcHandler.java =================================================================== --- trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/rpc/ClusteredMCMPHandlerRpcHandler.java 2008-09-17 12:58:10 UTC (rev 1846) +++ trunk/mod_cluster/src/main/java/org/jboss/modcluster/ha/rpc/ClusteredMCMPHandlerRpcHandler.java 2008-09-17 13:00:49 UTC (rev 1847) @@ -39,6 +39,8 @@ GroupRpcResponse getProxyConfiguration(); + GroupRpcResponse getProxyInfo(); + GroupRpcResponse isProxyHealthOK(); GroupRpcResponse markProxiesInError();