User: dmaplesden
Date: 01/11/26 15:13:32
Modified: src/main/org/jboss/mq SpyXAResourceManager.java
SpyMessage.java MessagePool.java
Log:
fix a bug caused by my message pooling changes.
Revision Changes Path
1.5 +1 -11 jbossmq/src/main/org/jboss/mq/SpyXAResourceManager.java
Index: SpyXAResourceManager.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyXAResourceManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SpyXAResourceManager.java 2001/11/14 01:53:40 1.4
+++ SpyXAResourceManager.java 2001/11/26 23:13:32 1.5
@@ -20,7 +20,7 @@
*
* @author Hiram Chirino ([EMAIL PROTECTED])
* @created August 16, 2001
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class SpyXAResourceManager implements java.io.Serializable {
@@ -96,11 +96,6 @@
transaction.acks = job;
}
connection.send( transaction );
- //release messages back to pool now they are sent
- if(transaction.messages != null){
- for(int i=0;i<transaction.messages.length;i++)
- MessagePool.releaseMessage(transaction.messages[i]);
- }
} else {
if ( state.txState != TX_PREPARED ) {
throw new XAException( "The transaction had not been prepared" );
@@ -109,11 +104,6 @@
transaction.xid = xid;
transaction.requestType = transaction.TWO_PHASE_COMMIT_COMMIT_REQUEST;
connection.send( transaction );
- //release messages back to pool now they are sent
- if(transaction.messages != null){
- for(int i=0;i<transaction.messages.length;i++)
- MessagePool.releaseMessage(transaction.messages[i]);
- }
}
state.txState = TX_COMMITED;
}
1.11 +3 -3 jbossmq/src/main/org/jboss/mq/SpyMessage.java
Index: SpyMessage.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/SpyMessage.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SpyMessage.java 2001/11/14 01:53:40 1.10
+++ SpyMessage.java 2001/11/26 23:13:32 1.11
@@ -25,7 +25,7 @@
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author David Maplesden ([EMAIL PROTECTED])
*
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class SpyMessage implements Serializable, Message, Comparable,
Externalizable {
@@ -176,7 +176,7 @@
public void setJMSPriority(int priority) throws JMSException {
if (priority < 0 || priority > 10)
- throw new JMSException("Unsupported priority: priority must be from 0-10");
+ throw new JMSException("Unsupported priority '"+priority+"': priority must
be from 0-10");
header.jmsPriority = priority;
}
@@ -745,7 +745,7 @@
}
//clear for next use in pool
- void reset() throws JMSException{
+ void clearMessage() throws JMSException{
clearBody();
this.ack = null;
this.session = null;
1.2 +1 -1 jbossmq/src/main/org/jboss/mq/MessagePool.java
Index: MessagePool.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jboss/mq/MessagePool.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MessagePool.java 2001/11/14 01:53:39 1.1
+++ MessagePool.java 2001/11/26 23:13:32 1.2
@@ -130,7 +130,7 @@
if(message == null)
return;
try{
- message.reset();
+ message.clearMessage();
}catch(javax.jms.JMSException e){
//unable to re-use message
return;
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
