User: chirino
Date: 01/10/27 21:07:35
Modified: src/main/org/jboss/mq/pm/rollinglogged
PersistenceManager.java SpyMessageLog.java
Log:
Reorganized the JMS message headers into a Header object so that the MessageCahe can
drop the message body from memory, but keep the headers.
Also fixed a bug witht he Browse() that was introduced with the message cache.
Revision Changes Path
1.11 +2 -2
jbossmq/src/main/org/jboss/mq/pm/rollinglogged/PersistenceManager.java
Index: PersistenceManager.java
===================================================================
RCS file:
/cvsroot/jboss/jbossmq/src/main/org/jboss/mq/pm/rollinglogged/PersistenceManager.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PersistenceManager.java 2001/10/28 01:27:01 1.10
+++ PersistenceManager.java 2001/10/28 04:07:35 1.11
@@ -33,7 +33,7 @@
* This class manages all persistence related services.
*
* @author David Maplesden ([EMAIL PROTECTED])
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class PersistenceManager extends ServiceMBeanSupport implements
org.jboss.mq.pm.PersistenceManager, PersistenceManagerMBean
{
@@ -506,7 +506,7 @@
if (dest instanceof org.jboss.mq.SpyTopic)
{
SpyMessage mesg = messages[j].getMessage();
- mesg.durableSubscriberID =
((org.jboss.mq.SpyTopic)dest).getDurableSubscriptionID();
+ mesg.header.durableSubscriberID =
((org.jboss.mq.SpyTopic)dest).getDurableSubscriptionID();
messages[j].invalidate(); // since we updated the message
}
q.restoreMessage(messages[j]);
1.5 +6 -6
jbossmq/src/main/org/jboss/mq/pm/rollinglogged/SpyMessageLog.java
Index: SpyMessageLog.java
===================================================================
RCS file:
/cvsroot/jboss/jbossmq/src/main/org/jboss/mq/pm/rollinglogged/SpyMessageLog.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SpyMessageLog.java 2001/10/28 01:27:01 1.4
+++ SpyMessageLog.java 2001/10/28 04:07:35 1.5
@@ -22,7 +22,7 @@
*
* @created August 16, 2001
* @author: Hiram Chirino ([EMAIL PROTECTED])
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class SpyMessageLog {
@@ -81,7 +81,7 @@
if ( o instanceof IntegrityLog.MessageAddedRecord ) {
IntegrityLog.MessageAddedRecord r = (
IntegrityLog.MessageAddedRecord )o;
- r.message.messageId = r.messageId;
+ r.message.header.messageId = r.messageId;
if ( r.isTransacted && !commited.contains( new org.jboss.mq.pm.Tx(
r.transactionId ) ) ) {
// the TX this message was part of was not
@@ -128,9 +128,9 @@
try {
if ( transactionId == null ) {
- transactionLog.add( message.messageId, false, -1, message );
+ transactionLog.add( message.header.messageId, false, -1, message );
} else {
- transactionLog.add( message.messageId, true, transactionId.longValue(),
message );
+ transactionLog.add( message.header.messageId, true,
transactionId.longValue(), message );
}
transactionLog.commit();
@@ -145,9 +145,9 @@
try {
if ( transactionId == null ) {
- transactionLog.remove( message.messageId, false, -1 );
+ transactionLog.remove( message.header.messageId, false, -1 );
} else {
- transactionLog.remove( message.messageId, true,
transactionId.longValue() );
+ transactionLog.remove( message.header.messageId, true,
transactionId.longValue() );
}
transactionLog.commit();
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
