User: starksm
Date: 01/12/13 13:29:22
Modified: src/main/org/jboss/mq/server Tag: Branch_2_4 BasicQueue.java
Log:
Some cleanup of logging and imports
Revision Changes Path
No revision
No revision
1.4.2.4 +14 -16 jbossmq/src/main/org/jboss/mq/server/BasicQueue.java
Index: BasicQueue.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/server/BasicQueue.java,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -r1.4.2.3 -r1.4.2.4
--- BasicQueue.java 2001/11/28 06:15:32 1.4.2.3
+++ BasicQueue.java 2001/12/13 21:29:22 1.4.2.4
@@ -31,7 +31,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author David Maplesden ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.4.2.3 $
+ * @version $Revision: 1.4.2.4 $
*/
//abstract public class BasicQueue implements Runnable {
public class BasicQueue
@@ -171,7 +171,7 @@
}
public SpyMessage receive( Subscription sub, boolean wait )
- throws JMSException
+ throws JMSException
{
SpyMessage message = null;
Selector selector = sub.getSelector();
@@ -221,7 +221,7 @@
}
public void destroy()
- throws JMSException
+ throws JMSException
{
synchronized ( unacknowledgedMessages )
{
@@ -240,13 +240,12 @@
}
public void acknowledge( AcknowledgementRequest item, org.jboss.mq.pm.Tx txId )
- throws javax.jms.JMSException
+ throws javax.jms.JMSException
{
// This task gets run to place the neg ack a messge (place it back on the
queue)
class RestoreMessageTask implements Runnable
- {
-
+ {
SpyMessage message;
int subscriptionId;
@@ -280,27 +279,26 @@
// Was it a negative acknowledge??
if ( !item.isAck )
{
-
+ //set redelivered flag
+ m.setJMSRedelivered(true);
Runnable task = new RestoreMessageTask( m, item.subscriberId );
server.getPersistenceManager().getTxManager().addPostCommitTask( txId,
task );
- } else
+ }
+ else
{
-
if ( this instanceof PersistentQueue && m.getJMSDeliveryMode() ==
DeliveryMode.PERSISTENT )
{
server.getPersistenceManager().remove( m, txId );
}
Runnable task = new RestoreMessageTask( m, item.subscriberId );
- server.getPersistenceManager().getTxManager().addPostRollbackTask( txId,
task );
-
+ server.getPersistenceManager().getTxManager().addPostRollbackTask( txId,
task );
}
-
}
-
+
public void addMessage( SpyMessage mes, org.jboss.mq.pm.Tx txId )
- throws JMSException
+ throws JMSException
{
// This task gets run to make the message visible in the queue.
class AddMessagePostCommitTask implements Runnable
@@ -339,9 +337,9 @@
unacknowledgedMessages.put( ack, message );
}
}
-
+
protected void queueMessageForSending( Subscription sub, SpyMessage message )
- throws JMSException
+ throws JMSException
{
setupMessageAcknowledgement( sub, message );
ReceiveRequest r = new ReceiveRequest();
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
