[jboss-cvs] JBoss Messaging SVN: r6692 - in trunk: tests/src/org/jboss/messaging/tests/integration/client and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed May 6 13:14:31 EDT 2009
Author: clebert.suconic at jboss.com
Date: 2009-05-06 13:14:30 -0400 (Wed, 06 May 2009)
New Revision: 6692
Modified:
trunk/src/main/org/jboss/messaging/core/client/impl/LargeMessageBufferImpl.java
trunk/tests/src/org/jboss/messaging/tests/integration/client/LargeMessageTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/largemessage/LargeMessageTestBase.java
Log:
just little tweaks (removing a bunch of verbose System.outs and logs)
Modified: trunk/src/main/org/jboss/messaging/core/client/impl/LargeMessageBufferImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/LargeMessageBufferImpl.java 2009-05-06 13:39:25 UTC (rev 6691)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/LargeMessageBufferImpl.java 2009-05-06 17:14:30 UTC (rev 6692)
@@ -117,8 +117,6 @@
}
}
- long size;
-
/**
* Add a buff to the List, or save it to the OutputStream if set
* @param packet
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/client/LargeMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/client/LargeMessageTest.java 2009-05-06 13:39:25 UTC (rev 6691)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/client/LargeMessageTest.java 2009-05-06 17:14:30 UTC (rev 6692)
@@ -70,7 +70,7 @@
static final SimpleString ADDRESS = new SimpleString("SimpleAddress");
// Static --------------------------------------------------------
- private static final Logger log = Logger.getLogger(LargeMessageTest.class);
+ private final Logger log = Logger.getLogger(LargeMessageTest.class);
// Constructors --------------------------------------------------
@@ -479,7 +479,7 @@
msg.acknowledge();
consumer.close();
- System.out.println("Stopping");
+ log.debug("Stopping");
session.stop();
@@ -1046,12 +1046,12 @@
session.start();
- System.out.println("Sending");
+ log.debug("Sending");
producer.send(clientFile);
producer.close();
- System.out.println("Waiting");
+ log.debug("Waiting");
ClientConsumer consumer = session.createConsumer(ADDRESS);
@@ -1127,16 +1127,16 @@
msg.putIntProperty(new SimpleString("key"), i);
producer.send(msg);
- System.out.println("Sent msg " + i);
+ log.debug("Sent msg " + i);
}
session.start();
- System.out.println("Sending");
+ log.debug("Sending");
producer.close();
- System.out.println("Waiting");
+ log.debug("Waiting");
ClientConsumer consumer = session.createConsumer(ADDRESS);
@@ -1158,7 +1158,7 @@
assertEquals(0, ((Queue)server.getPostOffice().getBinding(ADDRESS).getBindable()).getDeliveringCount());
assertEquals(0, ((Queue)server.getPostOffice().getBinding(ADDRESS).getBindable()).getMessageCount());
- System.out.println("Thread done");
+ log.debug("Thread done");
}
finally
{
@@ -1285,7 +1285,7 @@
{
ClientMessage message2 = consumer.receive(RECEIVE_WAIT_TIME);
- log.info("got message " + i);
+ log.debug("got message " + i);
assertNotNull(message2);
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/largemessage/LargeMessageTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/largemessage/LargeMessageTestBase.java 2009-05-06 13:39:25 UTC (rev 6691)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/largemessage/LargeMessageTestBase.java 2009-05-06 17:14:30 UTC (rev 6692)
@@ -222,7 +222,7 @@
for (int iteration = testBrowser ? 0 : 1; iteration < 2; iteration++)
{
- System.out.println("Iteration: " + iteration);
+ log.debug("Iteration: " + iteration);
session.stop();
@@ -243,7 +243,7 @@
try
{
- System.out.println("Message on consumer: " + msgCounter);
+ log.debug("Message on consumer: " + msgCounter);
if (delayDelivery > 0)
{
@@ -279,15 +279,11 @@
if (b[0] == getSamplebyte(bytesRead.get()))
{
bytesRead.addAndGet(b.length);
- System.out.println("Read position " + bytesRead.get() + " on consumer");
- if (bytesRead.get() == 1126400l)
- {
- System.out.println("I'm here");
- }
+ log.debug("Read position " + bytesRead.get() + " on consumer");
}
else
{
- System.out.println("Received invalid packet at position " + bytesRead.get());
+ log.warn("Received invalid packet at position " + bytesRead.get());
}
}
@@ -300,7 +296,7 @@
}
else
{
- System.out.println("byte not as expected!");
+ log.warn("byte not as expected!");
}
}
});
@@ -317,7 +313,7 @@
{
if (b % (1024l * 1024l) == 0)
{
- System.out.println("Read " + b + " bytes");
+ log.debug("Read " + b + " bytes");
}
assertEquals(getSamplebyte(b), buffer.readByte());
@@ -327,7 +323,7 @@
catch (Throwable e)
{
e.printStackTrace();
- System.out.println("Got an error");
+ log.warn("Got an error", e);
errors.incrementAndGet();
}
finally
@@ -359,7 +355,7 @@
assertNotNull(message);
- System.out.println("Message: " + i);
+ log.debug("Message: " + i);
System.currentTimeMillis();
@@ -401,7 +397,7 @@
}
else
{
- System.out.println("Received invalid packet at position " + bytesRead.get());
+ log.warn("Received invalid packet at position " + bytesRead.get());
}
}
@@ -411,7 +407,7 @@
{
if (bytesRead.get() % (1024l * 1024l) == 0)
{
- System.out.println("Read " + bytesRead.get() + " bytes");
+ log.debug("Read " + bytesRead.get() + " bytes");
}
if (b == (byte)'a')
{
@@ -419,7 +415,7 @@
}
else
{
- System.out.println("byte not as expected!");
+ log.warn("byte not as expected!");
}
}
});
@@ -432,7 +428,7 @@
{
if (b % (1024l * 1024l) == 0l)
{
- System.out.println("Read " + b + " bytes");
+ log.debug("Read " + b + " bytes");
}
assertEquals(getSamplebyte(b), buffer.readByte());
}
@@ -513,7 +509,7 @@
final ClientSession session,
final ClientProducer producer) throws Exception
{
- System.out.println("NumberOfBytes = " + numberOfBytes);
+ log.debug("NumberOfBytes = " + numberOfBytes);
for (int i = 0; i < numberOfMessages; i++)
{
ClientMessage message = session.createClientMessage(true);
@@ -522,12 +518,12 @@
// test
if (numberOfBytes > 1024 * 1024 || i % 2 == 0)
{
- System.out.println("Sending message (stream)" + i);
+ log.debug("Sending message (stream)" + i);
message.setBodyInputStream(createFakeLargeStream(numberOfBytes));
}
else
{
- System.out.println("Sending message (array)" + i);
+ log.debug("Sending message (array)" + i);
byte[] bytes = new byte[(int)numberOfBytes];
for (int j = 0; j < bytes.length; j++)
{
@@ -652,7 +648,7 @@
{
if (count++ % 1024 * 1024 == 0)
{
- //System.out.println("OutputStream received " + count + " bytes");
+ log.debug("OutputStream received " + count + " bytes");
}
if (closed)
{
More information about the jboss-cvs-commits
mailing list