Menu
▾
▴
[jboss-cvs] jboss-jms/src/main/org/jboss/messaging/core ...
|
From: Ovidiu F. <ovi...@jb...> - 2006-03-23 22:44:21
|
User: ovidiu
Date: 06/03/23 17:44:19
Modified: src/main/org/jboss/messaging/core Delivery.java
SimpleDelivery.java
Log:
Fixed Selector behavior. This is however a temporary fix, the final solution requires further thought.
Issue tracked by http://jira.jboss.org/jira/browse/JBMESSAGING-275.
Revision Changes Path
1.10 +7 -2 jboss-jms/src/main/org/jboss/messaging/core/Delivery.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Delivery.java
===================================================================
RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/messaging/core/Delivery.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- Delivery.java 22 Dec 2005 20:40:11 -0000 1.9
+++ Delivery.java 23 Mar 2006 22:44:19 -0000 1.10
@@ -26,9 +26,9 @@
*
* @author <a href="mailto:ov...@jb...">Ovidiu Feodorov</a>
* @author <a href="mailto:ti...@jb...">Tim Fox</a>
- * @version <tt>$Revision: 1.9 $</tt>
+ * @version <tt>$Revision: 1.10 $</tt>
*
- * $Id: Delivery.java,v 1.9 2005/12/22 20:40:11 timfox Exp $
+ * $Id: Delivery.java,v 1.10 2006/03/23 22:44:19 ovidiu Exp $
*/
public interface Delivery
{
@@ -42,4 +42,9 @@
DeliveryObserver getObserver();
+ // TODO this doesn't actually belong in the delivery, the selector should be moved "inside" the channel
+ // See http://jira.jboss.org/jira/browse/JBMESSAGING-275
+
+ boolean isSelectorAccepted();
+
}
1.18 +18 -2 jboss-jms/src/main/org/jboss/messaging/core/SimpleDelivery.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: SimpleDelivery.java
===================================================================
RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/messaging/core/SimpleDelivery.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- SimpleDelivery.java 1 Feb 2006 17:38:33 -0000 1.17
+++ SimpleDelivery.java 23 Mar 2006 22:44:19 -0000 1.18
@@ -31,9 +31,9 @@
*
* @author <a href="mailto:ov...@jb...">Ovidiu Feodorov</a>
* @author <a href="mailto:ti...@jb...">Tim Fox</a>
- * @version <tt>$Revision: 1.17 $</tt>
+ * @version <tt>$Revision: 1.18 $</tt>
*
- * $Id: SimpleDelivery.java,v 1.17 2006/02/01 17:38:33 timfox Exp $
+ * $Id: SimpleDelivery.java,v 1.18 2006/03/23 22:44:19 ovidiu Exp $
*/
public class SimpleDelivery implements SingleReceiverDelivery, Serializable
{
@@ -50,6 +50,7 @@
protected boolean done;
protected boolean cancelled;
+ protected boolean selectorAccepted;
protected DeliveryObserver observer;
protected MessageReference reference;
@@ -84,6 +85,16 @@
this.observer = observer;
}
+ public SimpleDelivery(DeliveryObserver observer, MessageReference reference, boolean done,
+ boolean selectorAccepted)
+ {
+ this.done = done;
+ this.reference = reference;
+ this.observer = observer;
+ this.selectorAccepted = selectorAccepted;
+ }
+
+
// Delivery implementation ---------------------------------
public MessageReference getReference()
@@ -101,6 +112,11 @@
return cancelled;
}
+ public synchronized boolean isSelectorAccepted()
+ {
+ return selectorAccepted;
+ }
+
public void setObserver(DeliveryObserver observer)
{
this.observer = observer;
|