[hornetq-commits] JBoss hornetq SVN: r9392 - in branches/2_2_0_HA_Improvements/src: main/org/hornetq/core/server/cluster/impl and 1 other directory.

Author: timfox Date: 2010-07-09 10:53:41 -0400 (Fri, 09 Jul 2010) New Revision: 9392 Modified: branches/2_2_0_HA_Improvements/src/config/common/schema/hornetq-configuration.xsd branches/2_2_0_HA_Improvements/src/config/common/schema/hornetq-jms.xsd branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java Log: ha improvements Modified: branches/2_2_0_HA_Improvements/src/config/common/schema/hornetq-configuration.xsd =================================================================== --- branches/2_2_0_HA_Improvements/src/config/common/schema/hornetq-configuration.xsd 2010-07-09 14:39:16 UTC (rev 9391) +++ branches/2_2_0_HA_Improvements/src/config/common/schema/hornetq-configuration.xsd 2010-07-09 14:53:41 UTC (rev 9392) @@ -200,9 +200,6 @@ <xsd:element name="broadcast-period" type="xsd:long"/> - <xsd:element name="connector-ref" type="connector-refType"> - </xsd:element> - <xsd:element name="broadcast-group"> <xsd:complexType> <xsd:sequence> @@ -295,6 +292,8 @@ </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="forwarding-address" type="xsd:string"> </xsd:element> + <xsd:element maxOccurs="1" minOccurs="0" name="ha" type="xsd:boolean"> + </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="filter"> <xsd:complexType> <xsd:attribute name="string" type="xsd:string" use="required"/> @@ -318,9 +317,14 @@ </xsd:element> <xsd:element maxOccurs="1" minOccurs="0" name="password" type="xsd:string"> </xsd:element> - <xsd:choice> - <xsd:element maxOccurs="1" minOccurs="1" name="connector-ref" type="connector-refType"> - </xsd:element> + <xsd:choice> + <xsd:element maxOccurs="1" minOccurs="1" name="static-connectors"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="1" name="connector-ref" type="connectorRefType"/> + </xsd:sequence> + </xsd:complexType> + </xsd:element> <xsd:element maxOccurs="1" minOccurs="1" name="discovery-group-ref"> <xsd:complexType> <xsd:attribute name="discovery-group-name" type="xsd:IDREF" use="required"> @@ -347,9 +351,13 @@ <xsd:element maxOccurs="1" minOccurs="0" name="confirmation-window-size" type="xsd:int"> </xsd:element> <xsd:choice> - <xsd:element maxOccurs="1" minOccurs="1" name="static-connectors" type="connector-refType"> - - </xsd:element> + <xsd:element maxOccurs="1" minOccurs="1" name="static-connectors"> + <xsd:complexType> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="0" name="connector-ref" type="connectorRefType"/> + </xsd:sequence> + </xsd:complexType> + </xsd:element> <xsd:element maxOccurs="1" minOccurs="1" name="discovery-group-ref"> <xsd:complexType> <xsd:attribute name="discovery-group-name" type="xsd:IDREF" use="required"> Modified: branches/2_2_0_HA_Improvements/src/config/common/schema/hornetq-jms.xsd =================================================================== --- branches/2_2_0_HA_Improvements/src/config/common/schema/hornetq-jms.xsd 2010-07-09 14:39:16 UTC (rev 9391) +++ branches/2_2_0_HA_Improvements/src/config/common/schema/hornetq-jms.xsd 2010-07-09 14:53:41 UTC (rev 9392) @@ -29,7 +29,7 @@ <xsd:element name="discovery-group-ref" type="discovery-group-refType" maxOccurs="1" minOccurs="0"></xsd:element> <xsd:element name="discovery-initial-wait-timeout" type="xsd:long" maxOccurs="1" minOccurs="0"></xsd:element> - <xsd:element name="connectors" maxOccurs="1" minOccurs="0"> + <xsd:element name="static-connectors" maxOccurs="1" minOccurs="0"> <xsd:complexType> <xsd:sequence> <xsd:element name="connector-ref" type="connector-refType" Modified: branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java =================================================================== --- branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2010-07-09 14:39:16 UTC (rev 9391) +++ branches/2_2_0_HA_Improvements/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2010-07-09 14:53:41 UTC (rev 9392) @@ -256,6 +256,8 @@ { server.getClusterManager().nodeDown(nodeID); + //Remove the flow record for that node + MessageFlowRecord record = records.remove(nodeID); if (record != null)