User: pra     
  Date: 02/03/06 09:16:29

  Modified:    src/main/org/jboss/mq SpyTopicPublisher.java
                        SpyQueueSender.java
  Log:
  Changed to add correct behaviour when running as identifyes or unidentifyed 
producer; throw UnsupportedOperationException accrording to spec
  
  Revision  Changes    Path
  1.5       +31 -15    jbossmq/src/main/org/jboss/mq/SpyTopicPublisher.java
  
  Index: SpyTopicPublisher.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyTopicPublisher.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SpyTopicPublisher.java    14 Nov 2001 01:53:40 -0000      1.4
  +++ SpyTopicPublisher.java    6 Mar 2002 17:16:29 -0000       1.5
  @@ -17,10 +17,15 @@
   /**
    *  This class implements javax.jms.TopicPublisher
    *
  + * A publisher created with a null Topic will now be interpreted as
  + * created as an unidentifyed publisher and follows the spec in throwing
  + * UnsupportedOperationException  at the correct places.
  + *
    * @author     Norbert Lataille ([EMAIL PROTECTED])
    * @author     Hiram Chirino ([EMAIL PROTECTED])
  + * @author     <a href="[EMAIL PROTECTED]">Peter Antman</a>
    * @created    August 16, 2001
  - * @version    $Revision: 1.4 $
  + * @version    $Revision: 1.5 $
    */
   public class SpyTopicPublisher
          extends SpyMessageProducer
  @@ -55,30 +60,42 @@
      }
   
      //Publish methods
  -
      public void publish( Message message )
         throws JMSException {
         if ( myTopic == null ) {
  -         throw new InvalidDestinationException( "I do not have a default 
Destination !" );
  +         throw new UnsupportedOperationException("Not constructed with identifyed 
topic. Usage of method not allowed");
         }
  -      publish( myTopic, message, defaultDeliveryMode, defaultPriority, defaultTTL );
  -   }
  -
  -   public void publish( Topic topic, Message message )
  -      throws JMSException {
  -      publish( topic, message, defaultDeliveryMode, defaultPriority, defaultTTL );
  +      internalPublish( myTopic, message, defaultDeliveryMode, defaultPriority, 
defaultTTL );
      }
  -
  +   
      public void publish( Message message, int deliveryMode, int priority, long 
timeToLive )
         throws JMSException {
         if ( myTopic == null ) {
  -         throw new InvalidDestinationException( "Destination is null !" );
  +         throw new UnsupportedOperationException("Not constructed with identifyed 
topic. Usage of method not allowed");
         }
  -      publish( myTopic, message, deliveryMode, priority, timeToLive );
  +      internalPublish( myTopic, message, deliveryMode, priority, timeToLive );
      }
   
  +   public void publish( Topic topic, Message message )
  +      throws JMSException {
  +      // If its the same object (place in memmory) its ok.
  +      if (myTopic != null && !myTopic.equals(topic))
  +         throw new UnsupportedOperationException("Publishing to unidentifyed topic 
not allowed when publisher created with an identifyed topic");
  +      internalPublish( topic, message, defaultDeliveryMode, defaultPriority, 
defaultTTL );
  +   }
  +   
  +   
  +   
      public void publish( Topic topic, Message message, int deliveryMode, int 
priority, long timeToLive )
         throws JMSException {
  +      if (myTopic != null && !myTopic.equals(topic))
  +         throw new UnsupportedOperationException("Publishing to unidentifyed topic 
not allowed when publisher created with an identifyed topic");
  +      internalPublish(topic, message, deliveryMode, priority, timeToLive);
  +   }
  +
  +
  +   protected void internalPublish(Topic topic, Message message, int deliveryMode, 
int priority, long timeToLive )
  +      throws JMSException {
         //Set the header fields
         message.setJMSDestination( topic );
         message.setJMSDeliveryMode( deliveryMode );
  @@ -91,16 +108,15 @@
         }
         message.setJMSPriority( priority );
         message.setJMSMessageID( mySession.getNewMessageID() );
  -
  +      
         // Encapsulate the message if not a SpyMessage
         if ( !( message instanceof SpyMessage ) ) {
            SpyEncapsulatedMessage m = MessagePool.getEncapsulatedMessage();
            m.setMessage( message );
            message = m;
         }
  -
  +      
         //Send the message
         mySession.sendMessage( ( SpyMessage )message );
      }
  -
   }
  
  
  
  1.4       +29 -14    jbossmq/src/main/org/jboss/mq/SpyQueueSender.java
  
  Index: SpyQueueSender.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyQueueSender.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SpyQueueSender.java       14 Nov 2001 01:53:40 -0000      1.3
  +++ SpyQueueSender.java       6 Mar 2002 17:16:29 -0000       1.4
  @@ -17,10 +17,15 @@
   /**
    *  This class implements javax.jms.QueueSender
    *
  + * A sender created with a null Queue will now be interpreted as
  + * created as an unidentifyed sender and follows the spec in throwing
  + * UnsupportedOperationException at the correct places.
  + *
    * @author     Norbert Lataille ([EMAIL PROTECTED])
    * @author     Hiram Chirino ([EMAIL PROTECTED])
  + * @author     <a href="[EMAIL PROTECTED]">Peter Antman</a>
    * @created    August 16, 2001
  - * @version    $Revision: 1.3 $
  + * @version    $Revision: 1.4 $
    */
   public class SpyQueueSender
          extends SpyMessageProducer
  @@ -55,30 +60,40 @@
      }
   
      //Send methods
  -
      public void send( Message message )
         throws JMSException {
         if ( queue == null ) {
  -         throw new InvalidDestinationException( "I do not have a default 
Destination !" );
  +         throw new UnsupportedOperationException("Not constructed with identifyed 
queue. Usage of method not allowed");
         }
  -      send( queue, message, defaultDeliveryMode, defaultPriority, defaultTTL );
  +      internalSend( queue, message, defaultDeliveryMode, defaultPriority, 
defaultTTL );
      }
  -
  -   public void send( Queue queue, Message message )
  -      throws JMSException {
  -      send( queue, message, defaultDeliveryMode, defaultPriority, defaultTTL );
  -   }
  -
  + 
      public void send( Message message, int deliveryMode, int priority, long 
timeToLive )
         throws JMSException {
         if ( queue == null ) {
  -         throw new InvalidDestinationException( "I do not have a default 
Destination !" );
  +         throw new UnsupportedOperationException("Not constructed with identifyed 
queue. Usage of method not allowed");
         }
  -      send( queue, message, deliveryMode, priority, timeToLive );
  +      internalSend( queue, message, deliveryMode, priority, timeToLive );
  +   }
  +     
  +   public void send( Queue queue, Message message )
  +      throws JMSException {
  +      if (this.queue != null && !this.queue.equals(queue))
  +         throw new UnsupportedOperationException("Sending to unidentifyed queue not 
allowed when sender created with an identifyed queue");
  +      
  +      internalSend( queue, message, defaultDeliveryMode, defaultPriority, 
defaultTTL );
      }
   
      public void send( Queue queue, Message message, int deliveryMode, int priority, 
long timeToLive )
         throws JMSException {
  +      if (this.queue != null  && !this.queue.equals(queue))
  +         throw new UnsupportedOperationException("Sending to unidentifyed queue not 
allowed when sender created with an identifyed queue");
  +      internalSend(queue,message,deliveryMode,priority,timeToLive);
  +
  +   }
  +   public void internalSend( Queue queue, Message message, int deliveryMode, int 
priority, long timeToLive )
  +      throws JMSException {
  +      
         //Set the header fields
         message.setJMSDestination( queue );
         message.setJMSDeliveryMode( deliveryMode );
  @@ -91,14 +106,14 @@
         }
         message.setJMSPriority( priority );
         message.setJMSMessageID( session.getNewMessageID() );
  -
  +      
         // Encapsulate the message if not a SpyMessage
         if ( !( message instanceof SpyMessage ) ) {
            SpyEncapsulatedMessage m = MessagePool.getEncapsulatedMessage();
            m.setMessage( message );
            message = m;
         }
  -
  +      
         //Send the message.
         session.sendMessage( ( SpyMessage )message );
      }
  
  
  

_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development

Reply via email to