[JBoss-dev] CVS update: jbossmq/src/main/org/jbossmq SpyMessage.java

[<pke...@us...>]

  User: pkendall
  Date: 01/05/17 16:43:56

  Modified:    src/main/org/jbossmq SpyMessage.java
  Log:
  Throw IllegalStateException on acknowledge() if the session is closed.
  
  Revision  Changes    Path
  1.5       +12 -8     jbossmq/src/main/org/jbossmq/SpyMessage.java
  
  Index: SpyMessage.java
  ===================================================================
  RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/SpyMessage.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SpyMessage.java	2001/03/02 01:12:40	1.4
  +++ SpyMessage.java	2001/05/17 23:43:56	1.5
  @@ -8,6 +8,7 @@
   
   import javax.jms.Message;
   import javax.jms.JMSException;
  +import javax.jms.IllegalStateException;
   import javax.jms.MessageFormatException;
   import javax.jms.MessageNotWriteableException;
   import javax.jms.Destination;
  @@ -22,7 +23,7 @@
    *	@author Norbert Lataille (Nor...@m4...)
    *	@author Hiram Chirino (Coj...@ho...)
    * 
  - *	@version $Revision: 1.4 $
  + *	@version $Revision: 1.5 $
    */
   public class SpyMessage 
   	implements Serializable, Cloneable, Message, Comparable
  @@ -439,8 +440,8 @@
   	 * before the o message. Return a positive if should be sent
   	 * after the o message.
   	 */
  -	public int compareTo(Object o) {
  -		
  +	public int compareTo(Object o)
  +	{
   		SpyMessage sm = (SpyMessage)o;
   		
   		if( jmsPriority > sm.jmsPriority) {
  @@ -455,28 +456,31 @@
   	
   	public void doAcknowledge() throws JMSException
   	{
  -		if( shouldAck )
  +		if( shouldAck ) {
  +			if( session.closed )
  +				throw new IllegalStateException("Session is closed.");
   			session.connection.send(getAcknowledgementRequest(true));
  -		
  +		}
   	}	
   	
   	
   	public void doNegAcknowledge() throws JMSException
   	{
  -		if( shouldAck )
  +		if( shouldAck ) {
  +			if( session.closed )
  +				throw new IllegalStateException("Session is closed.");
   			session.connection.send(getAcknowledgementRequest(false));
  +		}
   	}
   
   	public AcknowledgementRequest getAcknowledgementRequest(boolean isAck) throws JMSException
   	{
  -		
   		AcknowledgementRequest item = new AcknowledgementRequest();
   		item.destination = jmsDestination;
   		item.messageID = jmsMessageID;
   		item.isAck = isAck;
   		item.subscriberId = routeToSubscriber;
   		return item;		
  -		
   	}
   
   	public transient int routeToSubscriber;