User: pkendall
Date: 01/07/29 15:54:43
Modified: src/main/org/jbossmq SpySession.java SpyQueueSender.java
SpyMessageConsumer.java Connection.java
Log:
receiveNoWait bug fixes (didn't ACK messages)
clone only messages sent to more than one subscriber
only clone messages on send if transacted or using JVM IL
setReadOnlyMode on serverside so apps can still modify message after send
Revision Changes Path
1.7 +2 -2 jbossmq/src/main/org/jbossmq/SpySession.java
Index: SpySession.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/SpySession.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SpySession.java 2001/07/16 02:51:44 1.6
+++ SpySession.java 2001/07/29 22:54:43 1.7
@@ -34,7 +34,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
abstract public class SpySession
implements Runnable, Session, XASession
@@ -338,7 +338,7 @@
throw new IllegalStateException("The session is closed");
if( transacted ) {
-
connection.spyXAResourceManager.addMessage(currentTransactionId, m);
+
connection.spyXAResourceManager.addMessage(currentTransactionId, m.myClone());
} else {
connection.sendToServer(m);
}
1.4 +2 -6 jbossmq/src/main/org/jbossmq/SpyQueueSender.java
Index: SpyQueueSender.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/SpyQueueSender.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SpyQueueSender.java 2001/05/20 23:38:18 1.3
+++ SpyQueueSender.java 2001/07/29 22:54:43 1.4
@@ -20,7 +20,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class SpyQueueSender
extends SpyMessageProducer
@@ -95,11 +95,7 @@
message = m;
}
- // Clone the message so we can make the outbound message read only
- SpyMessage clone = ((SpyMessage)message).myClone();
- clone.setReadOnlyMode();
-
//Send the message.
- session.sendMessage(clone);
+ session.sendMessage((SpyMessage)message);
}
}
1.9 +2 -7 jbossmq/src/main/org/jbossmq/SpyMessageConsumer.java
Index: SpyMessageConsumer.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/SpyMessageConsumer.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SpyMessageConsumer.java 2001/07/28 00:30:15 1.8
+++ SpyMessageConsumer.java 2001/07/29 22:54:43 1.9
@@ -26,7 +26,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class SpyMessageConsumer implements MessageConsumer, SpyConsumer {
@@ -342,12 +342,7 @@
SpyMessage mes = (SpyMessage)
messages.removeFirst();
- //the SAME Message object is put in different
SessionQueues
- //when we deliver it, we have to clone() it to
insure independance
- //HRC: could we avoid this if we know that we
are delivering in P2P???
- SpyMessage message = mes.myClone();
-
- Message rc = preProcessMessage( message );
+ Message rc = preProcessMessage( mes);
// could happen if the message has expired.
if( rc == null )
continue;
1.5 +13 -3 jbossmq/src/main/org/jbossmq/Connection.java
Index: Connection.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/Connection.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Connection.java 2001/07/28 16:11:35 1.4
+++ Connection.java 2001/07/29 22:54:43 1.5
@@ -43,7 +43,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class Connection implements java.io.Serializable, javax.jms.Connection {
//////////////////////////////////////////////////////////////
@@ -399,7 +399,12 @@
throw new IllegalStateException("The connection is closed");
try {
- return serverIL.receive(connectionToken, sub.subscriptionId,
wait);
+ SpyMessage message = serverIL.receive(connectionToken,
sub.subscriptionId, wait);
+ if( message != null ) {
+ message.shouldAck = true;
+ message.routeToSubscriber = sub.subscriptionId;
+ }
+ return message;
} catch (Exception e) {
throw new SpyJMSException( "Cannot create a
ConnectionReceiver",e);
}
@@ -621,7 +626,12 @@
while( iter.hasNext() ) {
SpyConsumer consumer =
(SpyConsumer)iter.next();
-
consumer.addMessage(requests[i].message);
+ if( iter.hasNext() ) {
+
consumer.addMessage(requests[i].message.myClone());
+ }
+ else {
+
consumer.addMessage(requests[i].message);
+ }
consumersUsed.add(consumer);
}
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development