Author: clebert.suconic Date: 2011-09-30 15:45:11 -0400 (Fri, 30 Sep 2011) New Revision: 11454 Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java Log: tight up DiscoveryGroup creationg on RA Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-09-30 17:23:18 UTC (rev 11453) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ServerLocatorImpl.java 2011-09-30 19:45:11 UTC (rev 11454) @@ -743,7 +743,7 @@ if (System.currentTimeMillis() > timeout && !receivedTopology && !closed && !closing) { throw new HornetQException(HornetQException.CONNECTION_TIMEDOUT, - "Timed out waiting to receive cluster topology"); + "Timed out waiting to receive cluster topology. Group:" + discoveryGroup); } } Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2011-09-30 17:23:18 UTC (rev 11453) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2011-09-30 19:45:11 UTC (rev 11454) @@ -1431,6 +1431,52 @@ ha = HornetQClient.DEFAULT_IS_HA; } + if (discoveryAddress != null) + { + Integer discoveryPort = overrideProperties.getDiscoveryPort() != null ? overrideProperties.getDiscoveryPort() + : getDiscoveryPort(); + + if(discoveryPort == null) + { + discoveryPort = HornetQClient.DEFAULT_DISCOVERY_PORT; + } + + DiscoveryGroupConfiguration groupConfiguration = new DiscoveryGroupConfiguration(discoveryAddress, discoveryPort); + + if (log.isDebugEnabled()) + { + log.debug("Creating Connection Factory on the resource adapter for discovery=" + groupConfiguration + " with ha=" + ha); + } + + Long refreshTimeout = overrideProperties.getDiscoveryRefreshTimeout() != null ? overrideProperties.getDiscoveryRefreshTimeout() + : raProperties.getDiscoveryRefreshTimeout(); + if (refreshTimeout == null) + { + refreshTimeout = HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT; + } + + Long initialTimeout = overrideProperties.getDiscoveryInitialWaitTimeout() != null ? overrideProperties.getDiscoveryInitialWaitTimeout() + : raProperties.getDiscoveryInitialWaitTimeout(); + + if(initialTimeout == null) + { + initialTimeout = HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT; + } + + groupConfiguration.setDiscoveryInitialWaitTimeout(initialTimeout); + + groupConfiguration.setRefreshTimeout(refreshTimeout); + + if (ha) + { + cf = HornetQJMSClient.createConnectionFactoryWithHA(groupConfiguration, JMSFactoryType.XA_CF); + } + else + { + cf = HornetQJMSClient.createConnectionFactoryWithoutHA(groupConfiguration, JMSFactoryType.XA_CF); + } + } + else if (connectorClassName != null) { TransportConfiguration[] transportConfigurations = new TransportConfiguration[connectorClassName.size()]; @@ -1461,53 +1507,19 @@ transportConfigurations[i] = tc; } - if (ha) - { - cf = HornetQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.XA_CF, transportConfigurations); - } - else - { - cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.XA_CF, transportConfigurations); - } - } - else if (discoveryAddress != null) - { - Integer discoveryPort = overrideProperties.getDiscoveryPort() != null ? overrideProperties.getDiscoveryPort() - : getDiscoveryPort(); - if(discoveryPort == null) + if (log.isDebugEnabled()) { - discoveryPort = HornetQClient.DEFAULT_DISCOVERY_PORT; + log.debug("Creating Connection Factory on the resource adapter for transport=" + transportConfigurations + " with ha=" + ha); } - - DiscoveryGroupConfiguration groupConfiguration = new DiscoveryGroupConfiguration(discoveryAddress, discoveryPort); - - Long refreshTimeout = overrideProperties.getDiscoveryRefreshTimeout() != null ? overrideProperties.getDiscoveryRefreshTimeout() - : raProperties.getDiscoveryRefreshTimeout(); - if (refreshTimeout == null) - { - refreshTimeout = HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT; - } - - Long initialTimeout = overrideProperties.getDiscoveryInitialWaitTimeout() != null ? overrideProperties.getDiscoveryInitialWaitTimeout() - : raProperties.getDiscoveryInitialWaitTimeout(); - - if(initialTimeout == null) - { - initialTimeout = HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT; - } - - groupConfiguration.setDiscoveryInitialWaitTimeout(initialTimeout); - - groupConfiguration.setRefreshTimeout(refreshTimeout); - + if (ha) { - cf = HornetQJMSClient.createConnectionFactoryWithHA(groupConfiguration, JMSFactoryType.XA_CF); + cf = HornetQJMSClient.createConnectionFactoryWithHA(JMSFactoryType.XA_CF, transportConfigurations); } else { - cf = HornetQJMSClient.createConnectionFactoryWithoutHA(groupConfiguration, JMSFactoryType.XA_CF); + cf = HornetQJMSClient.createConnectionFactoryWithoutHA(JMSFactoryType.XA_CF, transportConfigurations); } } else