User: pkendall
Date: 01/07/29 21:09:54
Modified: src/main/org/jbossmq/server JMSTopic.java JMSQueue.java
JMSDestination.java ClientConsumer.java
Log:
bug fixes for addSubscriber and consumer adding
Revision Changes Path
1.2 +15 -5 jbossmq/src/main/org/jbossmq/server/JMSTopic.java
Index: JMSTopic.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/JMSTopic.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMSTopic.java 2001/07/28 00:33:38 1.1
+++ JMSTopic.java 2001/07/30 04:09:54 1.2
@@ -29,7 +29,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class JMSTopic extends JMSDestination {
@@ -112,8 +112,20 @@
// Package protected ---------------------------------------------
- JMSDestination addConsumer(Subscription sub,ClientConsumer c) throws
JMSException {
+ void addConsumer(Subscription sub,ClientConsumer c) throws JMSException {
+ cat.debug("Adding consumer: "+c);
+ SpyTopic topic = (SpyTopic)sub.destination;
+ DurableSubcriptionID id = topic.getDurableSubscriptionID();
+ if( id!=null ) {
+ JMSQueue queue = getDurableSubscription(id);
+ queue.addConsumer(sub,c);
+ }
+ else {
+ sharedQueue.addConsumer(c);
+ }
+ }
+ JMSDestination addSubscriber(Subscription sub) throws JMSException {
SpyTopic topic = (SpyTopic)sub.destination;
DurableSubcriptionID id = topic.getDurableSubscriptionID();
if( id!=null ) {
@@ -129,11 +141,9 @@
}
}
- return queue.addConsumer(sub, c);
+ return queue.addSubscriber(sub);
} else {
- cat.debug("Adding consumer: "+c);
- sharedQueue.addConsumer(c);
return this;
}
}
1.2 +7 -3 jbossmq/src/main/org/jbossmq/server/JMSQueue.java
Index: JMSQueue.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/JMSQueue.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JMSQueue.java 2001/07/28 00:33:38 1.1
+++ JMSQueue.java 2001/07/30 04:09:54 1.2
@@ -29,7 +29,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class JMSQueue extends JMSDestination {
@@ -111,9 +111,13 @@
ExclusiveQueue exclusiveQueue;
// Package protected ---------------------------------------------
- JMSDestination addConsumer(Subscription sub,ClientConsumer c) throws
JMSException {
- cat.debug("Adding consumer: "+c+")");
+ void addConsumer(Subscription sub,ClientConsumer c) throws JMSException {
+ cat.debug("Adding consumer: "+c);
exclusiveQueue.addConsumer(c);
+ }
+
+ JMSDestination addSubscriber(Subscription sub) throws JMSException {
+ cat.debug("Adding subscriber: "+sub);
return this;
}
1.9 +4 -2 jbossmq/src/main/org/jbossmq/server/JMSDestination.java
Index: JMSDestination.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/JMSDestination.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JMSDestination.java 2001/07/28 00:30:16 1.8
+++ JMSDestination.java 2001/07/30 04:09:54 1.9
@@ -29,7 +29,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
abstract public class JMSDestination {
@@ -86,7 +86,9 @@
org.apache.log4j.Category cat;
// Package protected ---------------------------------------------
- abstract JMSDestination addConsumer(Subscription sub, ClientConsumer c) throws
JMSException;
+ abstract void addConsumer(Subscription sub,ClientConsumer c) throws
JMSException;
+
+ abstract JMSDestination addSubscriber(Subscription sub) throws JMSException;
abstract public void notifyMessageAvailable();
1.13 +5 -3 jbossmq/src/main/org/jbossmq/server/ClientConsumer.java
Index: ClientConsumer.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/ClientConsumer.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ClientConsumer.java 2001/07/30 03:26:51 1.12
+++ ClientConsumer.java 2001/07/30 04:09:54 1.13
@@ -31,7 +31,7 @@
*
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
*/
public class ClientConsumer implements Runnable {
@@ -142,7 +142,7 @@
if (queue==null) throw new JMSException("This destination does not
exist !");
SubscriptionState subState = new SubscriptionState( req );
- subState.dest = queue.addConsumer(req, this);
+ subState.dest = queue.addSubscriber(req);
synchronized (subscriptions ) {
HashMap subscriptionsClone = (HashMap)subscriptions.clone();
@@ -150,8 +150,10 @@
subscriptions = subscriptionsClone;
LinkedList ll = (LinkedList)destinationSubscriptions.get(
req.destination );
- if( ll == null )
+ if( ll == null ) {
ll = new LinkedList();
+ queue.addConsumer(req,this);
+ }
else
ll = (LinkedList)ll.clone();
ll.add( subState );
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development