User: norbert
Date: 00/06/18 21:23:12
Modified: src/java/org/spydermq JMSServer.java JMSServerQueue.java
Log.java SpyConnection.java SpyTopicSession.java
Log:
More work for the OIL
Revision Changes Path
1.6 +6 -1 spyderMQ/src/java/org/spydermq/JMSServer.java
Index: JMSServer.java
===================================================================
RCS file: /products/cvs/ejboss/spyderMQ/src/java/org/spydermq/JMSServer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JMSServer.java 2000/06/14 23:20:59 1.5
+++ JMSServer.java 2000/06/19 04:23:11 1.6
@@ -22,7 +22,7 @@
*
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class JMSServer
implements Runnable, JMSServerMBean
@@ -91,7 +91,12 @@
// size() is O(1) in LinkedList...
int size=taskQueue.size();
if (size!=0) {
+
+ //<DEBUG>
queue=(JMSServerQueue)taskQueue.removeFirst();
+
//queue=(JMSServerQueue)taskQueue.getFirst();
+ //</DEBUG>
+
//One other thread can start working
on the task queue...
if (size>1) taskQueue.notify();
} else {
1.11 +5 -1 spyderMQ/src/java/org/spydermq/JMSServerQueue.java
Index: JMSServerQueue.java
===================================================================
RCS file: /products/cvs/ejboss/spyderMQ/src/java/org/spydermq/JMSServerQueue.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- JMSServerQueue.java 2000/06/15 04:02:29 1.10
+++ JMSServerQueue.java 2000/06/19 04:23:12 1.11
@@ -18,7 +18,7 @@
*
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
*/
public class JMSServerQueue
{
@@ -132,7 +132,11 @@
synchronized (messages) {
SpyMessage[] mes=new SpyMessage[messages.size()];
mes=(SpyMessage[])messages.toArray(mes);
+
+ //<DEBUG>
messages.clear();
+ //</DEBUG>
+
threadWorking=true;
alreadyInTaskQueue=false;
return mes;
1.6 +2 -2 spyderMQ/src/java/org/spydermq/Log.java
Index: Log.java
===================================================================
RCS file: /products/cvs/ejboss/spyderMQ/src/java/org/spydermq/Log.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Log.java 2000/06/15 04:02:28 1.5
+++ Log.java 2000/06/19 04:23:12 1.6
@@ -12,7 +12,7 @@
*
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class Log
{
@@ -21,7 +21,7 @@
final static int LOG_ERRORS = 3;
//Change this line change the verbosity level
- final static int logType = LOG_EVERYTHING;
+ final static int logType = LOG_ERRORS;
private static void print(Object obj)
{
1.8 +7 -1 spyderMQ/src/java/org/spydermq/SpyConnection.java
Index: SpyConnection.java
===================================================================
RCS file: /products/cvs/ejboss/spyderMQ/src/java/org/spydermq/SpyConnection.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SpyConnection.java 2000/06/15 23:21:40 1.7
+++ SpyConnection.java 2000/06/19 04:23:12 1.8
@@ -29,7 +29,7 @@
*
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class SpyConnection
implements Connection, Serializable
@@ -75,6 +75,12 @@
}
// Public --------------------------------------------------------
+
+ //<DEBUG>
+
+ public int rec=0;
+
+ //</DEBUG>
public String getClientID() throws JMSException
{
1.3 +8 -1 spyderMQ/src/java/org/spydermq/SpyTopicSession.java
Index: SpyTopicSession.java
===================================================================
RCS file: /products/cvs/ejboss/spyderMQ/src/java/org/spydermq/SpyTopicSession.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SpyTopicSession.java 2000/06/14 19:16:51 1.2
+++ SpyTopicSession.java 2000/06/19 04:23:12 1.3
@@ -24,7 +24,7 @@
*
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class SpyTopicSession
extends SpySession
@@ -164,6 +164,13 @@
//notify the thread that there is work to do
mutex.notifyLock();
+
+ //DEBUG !
+ if (outgoingQueue.size()>9000)
+ try {
+ Thread.sleep(200);
+ } catch (InterruptedException e) {
+ }
}