diff options
Diffstat (limited to 'java/client/src')
3 files changed, 21 insertions, 5 deletions
diff --git a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java b/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java index 32665c2a24..257d96bbe2 100644 --- a/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java +++ b/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_10.java @@ -103,7 +103,7 @@ public class BasicMessageProducer_0_10 extends BasicMessageProducer origMessage.setJMSExpiration(message.get010Message().getDeliveryProperties().getExpiration()); origMessage.setJMSMessageID(message.getJMSMessageID()); origMessage.setJMSDeliveryMode(deliveryMode); - + BasicContentHeaderProperties contentHeaderProperties = message.getContentHeaderProperties(); if (contentHeaderProperties.reset()) { @@ -159,6 +159,7 @@ public class BasicMessageProducer_0_10 extends BasicMessageProducer catch (RuntimeException rte) { JMSException ex = new JMSException("Exception when sending message"); + rte.printStackTrace(); ex.setLinkedException(rte); throw ex; } diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/Client.java b/java/client/src/main/java/org/apache/qpidity/nclient/Client.java index a5483a9c52..f6e7911078 100644 --- a/java/client/src/main/java/org/apache/qpidity/nclient/Client.java +++ b/java/client/src/main/java/org/apache/qpidity/nclient/Client.java @@ -19,6 +19,7 @@ import org.apache.qpidity.transport.ConnectionEvent; import org.apache.qpidity.transport.ProtocolHeader; import org.apache.qpidity.transport.SessionDelegate; import org.apache.qpidity.transport.network.mina.MinaHandler; +import org.apache.qpidity.transport.network.nio.NioHandler; public class Client implements org.apache.qpidity.nclient.Connection @@ -72,7 +73,16 @@ public class Client implements org.apache.qpidity.nclient.Connection connectionDelegate.setPassword(password); connectionDelegate.setVirtualHost(virtualHost); - _conn = MinaHandler.connect(host, port,connectionDelegate); + if (System.getProperty("transport","mina").equalsIgnoreCase("nio")) + { + System.out.println("using NIO"); + _conn = NioHandler.connect(host, port,connectionDelegate); + } + else + { + System.out.println("using MINA"); + _conn = MinaHandler.connect(host, port,connectionDelegate); + } // XXX: hardcoded version numbers _conn.send(new ConnectionEvent(0, new ProtocolHeader(1, 0, 10))); @@ -119,6 +129,11 @@ public class Client implements org.apache.qpidity.nclient.Connection ClientSession ssn = new ClientSession(); ssn.attach(ch); ssn.sessionOpen(expiryInSeconds); + if (Boolean.getBoolean("batch") && System.getProperty("transport").equalsIgnoreCase("nio")) + { + System.out.println("using batching"); + NioHandler.startBatchingFrames(_conn.getConnectionId()); + } return ssn; } diff --git a/java/client/src/main/java/org/apache/qpidity/nclient/impl/ClientSession.java b/java/client/src/main/java/org/apache/qpidity/nclient/impl/ClientSession.java index 4c5993455c..34f902061e 100644 --- a/java/client/src/main/java/org/apache/qpidity/nclient/impl/ClientSession.java +++ b/java/client/src/main/java/org/apache/qpidity/nclient/impl/ClientSession.java @@ -21,7 +21,7 @@ public class ClientSession extends org.apache.qpidity.transport.Session implemen { static { - String max = "message_size_before_sync"; + String max = "message_size_before_sync"; // KB's try { MAX_NOT_SYNC_DATA_LENGH = new Long(System.getProperties().getProperty(max, "200000000")); @@ -132,7 +132,7 @@ public class ClientSession extends org.apache.qpidity.transport.Session implemen public void endData() { super.endData(); - if( MAX_NOT_SYNC_DATA_LENGH != -1 && _currentDataSizeNotSynced >= MAX_NOT_SYNC_DATA_LENGH) + /* if( MAX_NOT_SYNC_DATA_LENGH != -1 && _currentDataSizeNotSynced >= MAX_NOT_SYNC_DATA_LENGH) { sync(); } @@ -140,7 +140,7 @@ public class ClientSession extends org.apache.qpidity.transport.Session implemen { executionFlush(); _currentDataSizeNotFlushed = 0; - } + }*/ } public RangeSet getAccquiredMessages() |