User: chirino
Date: 01/06/24 16:24:48
Modified: src/main/org/jbossmq/server BasicQueue.java
ClientConsumer.java ExclusiveQueue.java
JMSServer.java
Log:
Hunted down and eliminated the bug that was causing the jbosstest to fail.
Revision Changes Path
1.6 +4 -7 jbossmq/src/main/org/jbossmq/server/BasicQueue.java
Index: BasicQueue.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/BasicQueue.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BasicQueue.java 2001/06/24 21:15:30 1.5
+++ BasicQueue.java 2001/06/24 23:24:47 1.6
@@ -32,7 +32,7 @@
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
abstract public class BasicQueue implements Runnable {
//List of messages waiting to be dispatched
@@ -57,6 +57,7 @@
//restore a message to the message list...
synchronized (messages) {
messages.add(mes);
+ cat.debug("Restored a message, queue size:"+ messages.size());
}
notifyMessageAvailable();
}
@@ -77,19 +78,15 @@
//restore a message to the message list...
synchronized (messages) {
messages.add(message);
+ cat.debug("Added a message, queue size:"+
messages.size());
}
notifyMessageAvailable();
}
}
- // The message gets added to the queue after the transaction
- // commits (if the message was transacted)
+ // The message gets added to the queue after the transaction commits
Runnable task = new AddMessagePostCommitTask(mes);
- if( txId == null ) {
- task.run();
- } else {
- server.persistenceManager.addPostCommitTask(txId, task);
- }
+ server.persistenceManager.addPostCommitTask(txId, task);
}
1.7 +4 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ClientConsumer.java 2001/06/24 21:15:30 1.6
+++ ClientConsumer.java 2001/06/24 23:24:47 1.7
@@ -31,7 +31,7 @@
*
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class ClientConsumer implements Runnable {
//List of messages waiting to be transmitted to the client
@@ -282,6 +282,7 @@
// Notify the queue. It could be waiting for a consumer
req.receiving = true;
getSubscribedQueue(req).notifyMessageAvailable();
+ notifyMessageAvailable();
return null;
}
@@ -383,9 +384,11 @@
Subscription s = (Subscription)subs.next();
if( s.accepts( message, true ) ) {
-
+
s.receiving = false;
i.remove();
+
+ cat.debug("Removed a message, queue size:"+
queue.messages.size());
ReceiveRequest r = new ReceiveRequest();
r.message = message;
1.5 +0 -0 jbossmq/src/main/org/jbossmq/server/ExclusiveQueue.java
Index: ExclusiveQueue.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/ExclusiveQueue.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ExclusiveQueue.java 2001/06/24 21:15:30 1.4
+++ ExclusiveQueue.java 2001/06/24 23:24:47 1.5
@@ -28,7 +28,7 @@
* @author Hiram Chirino ([EMAIL PROTECTED])
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class ExclusiveQueue extends BasicQueue {
// Iterate over the consumers asking them to take messages until they stop
1.11 +1 -1 jbossmq/src/main/org/jbossmq/server/JMSServer.java
Index: JMSServer.java
===================================================================
RCS file: /cvsroot/jboss/jbossmq/src/main/org/jbossmq/server/JMSServer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JMSServer.java 2001/06/24 21:15:30 1.10
+++ JMSServer.java 2001/06/24 23:24:47 1.11
@@ -38,7 +38,7 @@
* @author Norbert Lataille ([EMAIL PROTECTED])
* @author Hiram Chirino ([EMAIL PROTECTED])
*
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class JMSServer
implements JMSServerMBean
@@ -90,7 +90,7 @@
threadGroup = new ThreadGroup("JBossMQ Server Threads");
- executor = new PooledExecutor(new BoundedBuffer(10), 25);
+ executor = new PooledExecutor(25);
executor.setMinimumPoolSize(0);
executor.setKeepAliveTime(1000*30);
executor.waitWhenBlocked();
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
