User: hiram
Date: 00/12/31 15:46:34
Modified: src/java/org/spydermq/server ClientConsumer.java
JMSServer.java
Log:
Implemented Non-optimized message delivery
Revision Changes Path
1.4 +14 -9 spyderMQ/src/java/org/spydermq/server/ClientConsumer.java
Index: ClientConsumer.java
===================================================================
RCS file:
/products/cvs/ejboss/spyderMQ/src/java/org/spydermq/server/ClientConsumer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ClientConsumer.java 2000/12/27 17:02:21 1.3
+++ ClientConsumer.java 2000/12/31 23:46:33 1.4
@@ -27,7 +27,7 @@
*
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class ClientConsumer implements Task {
@@ -66,15 +66,20 @@
int subscriptionId;
RestoreMessageTask(SpyMessage m,int subscriptionId) { message
= m; this.subscriptionId=subscriptionId; }
public void run() {
- Log.log("Restoring message: " + message.jmsMessageID);
- String queueId;
- if( message.jmsDestination instanceof SpyTopic ) {
- Subscription req =
(Subscription)subscriptions.get(new Integer(subscriptionId));
- queueId =
JMSDestination.durableSubscriptionToQueueId(dc.getClientID(),req.durableSubscriptionName);
- } else {
- queueId = JMSDestination.DEFAULT_QUEUE_ID;
+ try {
+ Log.log("Restoring message: " +
message.getJMSMessageID());
+ String queueId;
+ if( message.getJMSDestination() instanceof
SpyTopic ) {
+ Subscription req =
(Subscription)subscriptions.get(new Integer(subscriptionId));
+ queueId =
JMSDestination.durableSubscriptionToQueueId(dc.getClientID(),req.durableSubscriptionName);
+ } else {
+ queueId =
JMSDestination.DEFAULT_QUEUE_ID;
+ }
+ server.restoreMessage(message,queueId);
+ } catch ( JMSException e ) {
+ Log.error("Could not restore a
message:"+message);
+ Log.error(e);
}
- server.restoreMessage(message,queueId);
}
}
1.9 +12 -7 spyderMQ/src/java/org/spydermq/server/JMSServer.java
Index: JMSServer.java
===================================================================
RCS file: /products/cvs/ejboss/spyderMQ/src/java/org/spydermq/server/JMSServer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JMSServer.java 2000/12/27 17:02:21 1.8
+++ JMSServer.java 2000/12/31 23:46:33 1.9
@@ -27,7 +27,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class JMSServer
implements Runnable, JMSServerMBean
@@ -271,8 +271,8 @@
public void addMessage(SpyDistributedConnection dc, SpyMessage val, Long txId)
throws JMSException
{
- Log.notice("INCOMING: (TX="+txId+")"+dc.getClientID()+" =>
"+val.jmsDestination);
- JMSDestination
queue=(JMSDestination)messageQueue.get(val.jmsDestination);
+ Log.notice("INCOMING: (TX="+txId+")"+dc.getClientID()+" =>
"+val.getJMSDestination());
+ JMSDestination
queue=(JMSDestination)messageQueue.get(val.getJMSDestination());
if (queue==null) throw new JMSException("This destination does not
exist !");
//Add the message to the queue
queue.addMessage(val, txId);
@@ -498,10 +498,15 @@
public void restoreMessage(SpyMessage message, String queueId)
{
- JMSDestination
queue=(JMSDestination)messageQueue.get(message.jmsDestination);
- if (queue==null) throw new RuntimeException("This destination does not
exist!");
- //Add the message to the queue
- queue.restoreMessage(message, queueId);
+ try {
+ JMSDestination
queue=(JMSDestination)messageQueue.get(message.getJMSDestination());
+ if (queue==null) throw new RuntimeException("This destination
does not exist!");
+ //Add the message to the queue
+ queue.restoreMessage(message, queueId);
+ } catch ( JMSException e ) {
+ Log.error("Could not restore a message:"+message);
+ Log.error(e);
+ }
}
public void saveConfig() throws java.io.IOException {
