[jboss-cvs] jboss-jms/src/main/org/jboss/jms/server/connectionfactory ...

[Timothy Fox]

  User: timfox  
  Date: 06/07/27 15:01:54

  Modified:    src/main/org/jboss/jms/server/connectionfactory  
                        ConnectionFactory.java
                        ConnectionFactoryJNDIMapper.java
  Log:
  Mainly http://jira.jboss.com/jira/browse/JBMESSAGING-434 plus a few other bits and pieces
  
  Revision  Changes    Path
  1.10      +77 -62    jboss-jms/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConnectionFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- ConnectionFactory.java	26 Jul 2006 21:16:26 -0000	1.9
  +++ ConnectionFactory.java	27 Jul 2006 19:01:54 -0000	1.10
  @@ -6,23 +6,24 @@
    */
   package org.jboss.jms.server.connectionfactory;
   
  -import org.jboss.system.ServiceMBeanSupport;
  +import javax.management.ObjectName;
  +
  +import org.jboss.jms.server.ConnectionFactoryManager;
   import org.jboss.jms.server.ConnectionManager;
   import org.jboss.jms.server.ConnectorManager;
   import org.jboss.jms.server.ServerPeer;
  -import org.jboss.jms.server.ConnectionFactoryManager;
  +import org.jboss.jms.util.ExceptionUtil;
   import org.jboss.remoting.InvokerLocator;
  +import org.jboss.system.ServiceMBeanSupport;
   import org.w3c.dom.Element;
   
  -import javax.management.ObjectName;
  -
   /**
    * A deployable JBoss Messaging connection factory.
    *
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
  - * @version <tt>$Revision: 1.9 $</tt>
  + * @version <tt>$Revision: 1.10 $</tt>
    *
  - * $Id: ConnectionFactory.java,v 1.9 2006/07/26 21:16:26 ovidiu Exp $
  + * $Id: ConnectionFactory.java,v 1.10 2006/07/27 19:01:54 timfox Exp $
    */
   public class ConnectionFactory extends ServiceMBeanSupport
   {
  @@ -63,6 +64,8 @@
   
      public synchronized void startService() throws Exception
      {
  +      try
  +      {
         started = true;
         
         if (connectorObjectName == null)
  @@ -117,9 +120,16 @@
         log.info(info);
         log.info(this + " deployed");
      }
  +      catch (Throwable t)
  +      {
  +         throw ExceptionUtil.handleJMXInvocation(t, this + " startService");
  +      } 
  +   }
   
      public synchronized void stopService() throws Exception
      {
  +      try
  +      {
         started = false;
         
         connectionFactoryManager.unregisterConnectionFactory(connectionFactoryID);
  @@ -128,6 +138,11 @@
         
         log.info(this + " undeployed");
      }
  +      catch (Throwable t)
  +      {
  +         throw ExceptionUtil.handleJMXInvocation(t, this + " startService");
  +      } 
  +   }
   
      // JMX managed attributes ----------------------------------------
      
  
  
  
  1.10      +6 -15     jboss-jms/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConnectionFactoryJNDIMapper.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- ConnectionFactoryJNDIMapper.java	17 Jul 2006 17:14:45 -0000	1.9
  +++ ConnectionFactoryJNDIMapper.java	27 Jul 2006 19:01:54 -0000	1.10
  @@ -36,16 +36,15 @@
   import org.jboss.jms.server.endpoint.ServerConnectionFactoryEndpoint;
   import org.jboss.jms.server.endpoint.advised.ConnectionFactoryAdvised;
   import org.jboss.jms.server.remoting.JMSDispatcher;
  -import org.jboss.jms.util.MessagingJMSException;
   import org.jboss.jms.util.JNDIUtil;
   import org.jboss.logging.Logger;
   
   /**
    * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
    * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  - * @version <tt>$Revision: 1.9 $</tt>
  + * @version <tt>$Revision: 1.10 $</tt>
    *
  - * $Id: ConnectionFactoryJNDIMapper.java,v 1.9 2006/07/17 17:14:45 timfox Exp $
  + * $Id: ConnectionFactoryJNDIMapper.java,v 1.10 2006/07/27 19:01:54 timfox Exp $
    */
   public class ConnectionFactoryJNDIMapper implements ConnectionFactoryManager
   {
  @@ -85,18 +84,10 @@
            new ServerConnectionFactoryEndpoint(id, serverPeer, clientID, jndiBindings,
                                                prefetchSize);
   
  -      ClientConnectionFactoryDelegate delegate;
  -      try
  -      {
  -         delegate = new ClientConnectionFactoryDelegate(id, locatorURI,
  +      ClientConnectionFactoryDelegate delegate = new ClientConnectionFactoryDelegate(id, locatorURI,
                                                           serverPeer.getVersion(),
                                                           serverPeer.getServerPeerID(),
                                                           clientPing);
  -      }
  -      catch (Exception e)
  -      {
  -         throw new MessagingJMSException("Failed to create connection factory delegate", e);
  -      }
   
         ConnectionFactoryAdvised connFactoryAdvised = new ConnectionFactoryAdvised(endpoint);