[jboss-cvs] JBoss Messaging SVN: r5478 - in trunk/src/main/org/jboss/messaging: jms/client and 1 other directory.

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

Author: timfox
Date: 2008-12-08 10:54:01 -0500 (Mon, 08 Dec 2008)
New Revision: 5478

Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
   trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java
Log:
Fixed build


Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java	2008-12-08 15:40:33 UTC (rev 5477)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionFactoryImpl.java	2008-12-08 15:54:01 UTC (rev 5478)
@@ -224,16 +224,24 @@
                                    final long retryInterval,
                                    final double retryIntervalMultiplier,
                                    final int maxRetriesBeforeFailover,
-                                   final int maxRetriesAfterFailover) throws Exception
+                                   final int maxRetriesAfterFailover) throws MessagingException
    {
-      InetAddress groupAddress = InetAddress.getByName(discoveryGroupName);
+      try
+      {
+         InetAddress groupAddress = InetAddress.getByName(discoveryGroupName);
+   
+         discoveryGroup = new DiscoveryGroupImpl(groupAddress, discoveryGroupPort, discoveryRefreshTimeout);
+   
+         discoveryGroup.registerListener(this);
+   
+         discoveryGroup.start();
+      }
+      catch (Exception e)
+      {
+         //TODO - handle exceptions better
+         throw new MessagingException(MessagingException.NOT_CONNECTED, e.toString());
+      }
 
-      discoveryGroup = new DiscoveryGroupImpl(groupAddress, discoveryGroupPort, discoveryRefreshTimeout);
-
-      discoveryGroup.registerListener(this);
-
-      discoveryGroup.start();
-
       this.initialWaitTimeout = initialWaitTimeout;
       this.loadBalancingPolicy = instantiateLoadBalancingPolicy(connectionloadBalancingPolicyClassName);
       this.pingPeriod = pingPeriod;

Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java	2008-12-08 15:40:33 UTC (rev 5477)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossConnectionFactory.java	2008-12-08 15:54:01 UTC (rev 5478)
@@ -12,8 +12,6 @@
 
 package org.jboss.messaging.jms.client;
 
-import static org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE;
-
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -36,7 +34,6 @@
 
 import org.jboss.messaging.core.client.ClientSession;
 import org.jboss.messaging.core.client.ClientSessionFactory;
-import org.jboss.messaging.core.client.ConnectionLoadBalancingPolicy;
 import org.jboss.messaging.core.client.impl.ClientSessionFactoryImpl;
 import org.jboss.messaging.core.config.TransportConfiguration;
 import org.jboss.messaging.core.config.impl.ConfigurationImpl;