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

[Timothy Fox]

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

  Modified:    src/main/org/jboss/jms/server/subscription 
                        DurableSubscription.java
  Log:
  Mainly http://jira.jboss.com/jira/browse/JBMESSAGING-434 plus a few other bits and pieces
  
  Revision  Changes    Path
  1.5       +4 -12     jboss-jms/src/main/org/jboss/jms/server/subscription/DurableSubscription.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: DurableSubscription.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/jms/server/subscription/DurableSubscription.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- DurableSubscription.java	17 Jul 2006 17:14:46 -0000	1.4
  +++ DurableSubscription.java	27 Jul 2006 19:01:55 -0000	1.5
  @@ -22,7 +22,6 @@
   package org.jboss.jms.server.subscription;
   
   import org.jboss.jms.selector.Selector;
  -import org.jboss.jms.util.MessagingJMSException;
   import org.jboss.messaging.core.local.Topic;
   import org.jboss.messaging.core.memory.MemoryManager;
   import org.jboss.messaging.core.plugin.contract.MessageStore;
  @@ -35,9 +34,9 @@
    * A DurableSubscription.
    * 
    * @author <a href="tim.fox at jboss.com">Tim Fox</a>
  - * @version $Revision: 1.4 $
  + * @version $Revision: 1.5 $
    *
  - * $Id: DurableSubscription.java,v 1.4 2006/07/17 17:14:46 timfox Exp $
  + * $Id: DurableSubscription.java,v 1.5 2006/07/27 19:01:55 timfox Exp $
    */
   public class DurableSubscription extends Subscription
   {
  @@ -69,16 +68,9 @@
      public void unsubscribe() throws Exception
      {
         disconnect();
  -      try
  -      {
            if (pm != null)
            {
               pm.removeAllChannelData(this.channelID);            
            }
         }
  -      catch (Exception e)
  -      {
  -         throw new MessagingJMSException("Failed to remove subscription data");
  -      }
  -   }   
   }