[jboss-cvs] JBoss Messaging SVN: r4180 - in trunk: src/main/org/jboss/messaging/core/client/impl and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue May 13 07:45:07 EDT 2008
Author: timfox
Date: 2008-05-13 07:45:07 -0400 (Tue, 13 May 2008)
New Revision: 4180
Modified:
trunk/src/main/org/jboss/messaging/core/client/ClientSession.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientMessageImpl.java
trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java
trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientCrashTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientExitTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/CrashClient.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/GracefulClient.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/PacketFilterTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSLTest.java
Log:
More tweaks
Modified: trunk/src/main/org/jboss/messaging/core/client/ClientSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/ClientSession.java 2008-05-13 10:39:36 UTC (rev 4179)
+++ trunk/src/main/org/jboss/messaging/core/client/ClientSession.java 2008-05-13 11:45:07 UTC (rev 4180)
@@ -35,8 +35,10 @@
SessionBindingQueryResponseMessage bindingQuery(SimpleString address) throws MessagingException;
ClientConsumer createConsumer(SimpleString queueName, SimpleString filterString, boolean noLocal,
- boolean autoDeleteQueue, boolean direct) throws MessagingException;
+ boolean autoDeleteQueue) throws MessagingException;
+ ClientConsumer createConsumer(SimpleString queueName) throws MessagingException;
+
ClientBrowser createBrowser(SimpleString queueName, SimpleString filterString) throws MessagingException;
ClientProducer createProducer(SimpleString address) throws MessagingException;
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java 2008-05-13 10:39:36 UTC (rev 4179)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java 2008-05-13 11:45:07 UTC (rev 4180)
@@ -67,9 +67,7 @@
private final ExecutorService sessionExecutor;
private final RemotingConnection remotingConnection;
-
- private final boolean direct;
-
+
private final int tokenBatchSize;
private final PriorityLinkedList<ClientMessage> buffer = new PriorityLinkedListImpl<ClientMessage>(10);
@@ -102,7 +100,7 @@
final long clientTargetID,
final ExecutorService sessionExecutor,
final RemotingConnection remotingConnection,
- final boolean direct, final int tokenBatchSize)
+ final int tokenBatchSize)
{
this.targetID = targetID;
@@ -114,8 +112,6 @@
this.remotingConnection = remotingConnection;
- this.direct = direct;
-
this.tokenBatchSize = tokenBatchSize;
}
@@ -313,7 +309,8 @@
if (handler != null)
{
- if (direct)
+ //TODO
+ if (true)
{
//Dispatch it directly on remoting thread
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientMessageImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientMessageImpl.java 2008-05-13 10:39:36 UTC (rev 4179)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientMessageImpl.java 2008-05-13 11:45:07 UTC (rev 4180)
@@ -50,7 +50,7 @@
}
/*
- * Construct a message before sending
+ * Construct messages before sending
*/
public ClientMessageImpl(final int type, final boolean durable, final long expiration,
final long timestamp, final byte priority)
@@ -58,6 +58,16 @@
super(type, durable, expiration, timestamp, priority);
}
+ public ClientMessageImpl(final int type, final boolean durable)
+ {
+ super(type, durable, 0, System.currentTimeMillis(), (byte)4);
+ }
+
+ public ClientMessageImpl(final boolean durable)
+ {
+ super(0, durable, 0, System.currentTimeMillis(), (byte)4);
+ }
+
public void setDeliveryCount(final int deliveryCount)
{
this.deliveryCount = deliveryCount;
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java 2008-05-13 10:39:36 UTC (rev 4179)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java 2008-05-13 11:45:07 UTC (rev 4180)
@@ -257,8 +257,13 @@
remotingConnection.sendBlocking(serverTargetID, serverTargetID, request);
}
+ public ClientConsumer createConsumer(final SimpleString queueName) throws MessagingException
+ {
+ return createConsumer(queueName, null, false, false);
+ }
+
public ClientConsumer createConsumer(final SimpleString queueName, final SimpleString filterString, final boolean noLocal,
- final boolean autoDeleteQueue, final boolean direct) throws MessagingException
+ final boolean autoDeleteQueue) throws MessagingException
{
checkClosed();
@@ -273,7 +278,7 @@
int tokenBatchSize = response.getWindowSize() == -1 ? 0 : 1;
ClientConsumerInternal consumer =
- new ClientConsumerImpl(this, response.getConsumerTargetID(), clientTargetID, executor, remotingConnection, direct, tokenBatchSize);
+ new ClientConsumerImpl(this, response.getConsumerTargetID(), clientTargetID, executor, remotingConnection, tokenBatchSize);
consumers.put(response.getConsumerTargetID(), consumer);
Modified: trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java
===================================================================
--- trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java 2008-05-13 10:39:36 UTC (rev 4179)
+++ trunk/src/main/org/jboss/messaging/jms/client/JBossSession.java 2008-05-13 11:45:07 UTC (rev 4180)
@@ -487,7 +487,7 @@
throw new InvalidDestinationException("Queue " + dest.getName() + " does not exist");
}
- consumer = session.createConsumer(dest.getSimpleAddress(), coreFilterString, noLocal, false, false);
+ consumer = session.createConsumer(dest.getSimpleAddress(), coreFilterString, noLocal, false);
}
else
{
@@ -508,7 +508,7 @@
session.createQueue(dest.getSimpleAddress(), queueName, coreFilterString, false, false);
- consumer = session.createConsumer(queueName, null, noLocal, true, false);
+ consumer = session.createConsumer(queueName, null, noLocal, true);
}
else
{
@@ -570,7 +570,7 @@
}
}
- consumer = session.createConsumer(queueName, null, noLocal, false, false);
+ consumer = session.createConsumer(queueName, null, noLocal, false);
}
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java 2008-05-13 10:39:36 UTC (rev 4179)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/CoreClientTest.java 2008-05-13 11:45:07 UTC (rev 4180)
@@ -75,7 +75,7 @@
message.getBody().putString("testINVMCoreClient");
producer.send(message);
- ClientConsumer consumer = session.createConsumer(QUEUE, null, false, false, true);
+ ClientConsumer consumer = session.createConsumer(QUEUE);
conn.start();
message = consumer.receive(1000);
@@ -125,7 +125,7 @@
message.getBody().flip();
- ClientConsumer consumer = session.createConsumer(QUEUE, null, false, false, true);
+ ClientConsumer consumer = session.createConsumer(QUEUE);
final CountDownLatch latch = new CountDownLatch(1);
@@ -163,7 +163,7 @@
System.out.println("Starting");
- //conn.start();
+ conn.start();
long start = System.currentTimeMillis();
@@ -172,16 +172,16 @@
producer.send(message);
}
- long end = System.currentTimeMillis();
+// long end = System.currentTimeMillis();
+//
+// double actualRate = 1000 * (double)numMessages / ( end - start);
- double actualRate = 1000 * (double)numMessages / ( end - start);
+ // System.out.println("Rate is " + actualRate);
- System.out.println("Rate is " + actualRate);
+ // conn.start();
- conn.start();
+ // start = System.currentTimeMillis();
- start = System.currentTimeMillis();
-
latch.await();
// long end = System.currentTimeMillis();
@@ -197,9 +197,9 @@
- end = System.currentTimeMillis();
+ long end = System.currentTimeMillis();
- actualRate = 1000 * (double)numMessages / ( end - start);
+ double actualRate = 1000 * (double)numMessages / ( end - start);
System.out.println(" consume Rate is " + actualRate);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientCrashTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientCrashTest.java 2008-05-13 10:39:36 UTC (rev 4179)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientCrashTest.java 2008-05-13 11:45:07 UTC (rev 4180)
@@ -108,7 +108,7 @@
ClientSession session = connection.createClientSession(false, true,
true, -1, false, false);
session.createQueue(QUEUE, QUEUE, null, false, false);
- ClientConsumer consumer = session.createConsumer(QUEUE, null, false, false, true);
+ ClientConsumer consumer = session.createConsumer(QUEUE);
ClientProducer producer = session.createProducer(QUEUE);
connection.start();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientExitTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientExitTest.java 2008-05-13 10:39:36 UTC (rev 4179)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/ClientExitTest.java 2008-05-13 11:45:07 UTC (rev 4180)
@@ -109,7 +109,7 @@
connection = cf.createConnection(null, null);
ClientSession session = connection.createClientSession(false, true, true, -1, false, false);
session.createQueue(QUEUE, QUEUE, null, false, false);
- consumer = session.createConsumer(QUEUE, null, false, false, true);
+ consumer = session.createConsumer(QUEUE);
connection.start();
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/CrashClient.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/CrashClient.java 2008-05-13 10:39:36 UTC (rev 4179)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/CrashClient.java 2008-05-13 11:45:07 UTC (rev 4180)
@@ -78,7 +78,7 @@
ClientConnection conn = cf.createConnection();
ClientSession session = conn.createClientSession(false, true, true, -1, false, false);
ClientProducer producer = session.createProducer(QUEUE);
- ClientConsumer consumer = session.createConsumer(QUEUE, null, false, false, true);
+ ClientConsumer consumer = session.createConsumer(QUEUE);
if (numberOfConnections > 1)
{
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/GracefulClient.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/GracefulClient.java 2008-05-13 10:39:36 UTC (rev 4179)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/GracefulClient.java 2008-05-13 11:45:07 UTC (rev 4180)
@@ -66,7 +66,7 @@
ClientConnection conn = cf.createConnection(null, null);
ClientSession session = conn.createClientSession(false, true, true, -1, false, false);
ClientProducer producer = session.createProducer(QUEUE);
- ClientConsumer consumer = session.createConsumer(QUEUE, null, false, false, true);
+ ClientConsumer consumer = session.createConsumer(QUEUE);
ClientMessage message = new ClientMessageImpl(JBossTextMessage.TYPE, false, 0,
System.currentTimeMillis(), (byte) 1);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/PacketFilterTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/PacketFilterTest.java 2008-05-13 10:39:36 UTC (rev 4179)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/impl/PacketFilterTest.java 2008-05-13 11:45:07 UTC (rev 4180)
@@ -188,7 +188,7 @@
message.getBody().putString(msg);
producer.send(message);
- ClientConsumer consumer = session.createConsumer(QUEUE1, null, false, false, true);
+ ClientConsumer consumer = session.createConsumer(QUEUE1);
Message m = consumer.receive(100000);
assertEquals(m.getProperty(new SimpleString("DummyInterceptor")), new SimpleString("was here"));
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSLTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSLTest.java 2008-05-13 10:39:36 UTC (rev 4179)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/core/remoting/ssl/CoreClientOverSSLTest.java 2008-05-13 11:45:07 UTC (rev 4180)
@@ -133,7 +133,7 @@
connection = cf.createConnection(null, null);
ClientSession session = connection.createClientSession(false, true, true, -1, false, false);
session.createQueue(QUEUE, QUEUE, null, false, false);
- consumer = session.createConsumer(QUEUE, null, false, false, true);
+ consumer = session.createConsumer(QUEUE);
connection.start();
}
More information about the jboss-cvs-commits
mailing list