diff options
author | Rajith Muditha Attapattu <rajith@apache.org> | 2008-06-16 22:16:02 +0000 |
---|---|---|
committer | Rajith Muditha Attapattu <rajith@apache.org> | 2008-06-16 22:16:02 +0000 |
commit | 0f533c4a72b6224f4e01f4bbef996b5579c9fd50 (patch) | |
tree | 0d583e6ac3909a356505d25c3bc94f0b828e3370 /qpid/java/common | |
parent | 9dfdda8b51ad3dd29d4e6b1c051004cf9a0e88a8 (diff) | |
download | qpid-python-0f533c4a72b6224f4e01f4bbef996b5579c9fd50.tar.gz |
This is a fix for QPID-1140 and QPId-1141.
I also removed commented code as well as code that wasn't used.
Cleaned up unused imports as well.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@668333 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common')
-rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpidity/transport/network/io/IoHandler.java | 22 | ||||
-rw-r--r-- | qpid/java/common/src/main/java/org/apache/qpidity/transport/network/io/IoSender.java | 19 |
2 files changed, 10 insertions, 31 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/io/IoHandler.java b/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/io/IoHandler.java index 50d37f4b10..568526d9db 100644 --- a/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/io/IoHandler.java +++ b/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/io/IoHandler.java @@ -26,8 +26,6 @@ import java.net.InetSocketAddress; import java.net.Socket; import java.net.SocketException; import java.nio.ByteBuffer; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; import org.apache.qpidity.transport.Connection; @@ -54,8 +52,7 @@ public class IoHandler implements Runnable private Receiver<ByteBuffer> _receiver; private Socket _socket; private byte[] _readBuf; - private static Map<Integer,IoSender> _handlers = new ConcurrentHashMap<Integer,IoSender>(); - private AtomicInteger _count = new AtomicInteger(); + private static AtomicInteger _count = new AtomicInteger(); private int _readBufferSize; private int _writeBufferSize; @@ -105,11 +102,11 @@ public class IoHandler implements Runnable } catch (SocketException e) { - log.error(e,"Error connecting to broker"); + throw new RuntimeException("Error connecting to broker",e); } catch (IOException e) { - log.error(e,"Error connecting to broker"); + throw new RuntimeException("Error connecting to broker",e); } IoSender sender = new IoSender(_socket); @@ -118,8 +115,6 @@ public class IoHandler implements Runnable delegate); con.setConnectionId(_count.incrementAndGet()); - _handlers.put(con.getConnectionId(),sender); - _receiver = new InputHandler(new Assembler(con), InputHandler.State.PROTO_HDR); Thread t = new Thread(this); @@ -131,7 +126,7 @@ public class IoHandler implements Runnable public void run() { - // I set the read buffer size simillar to SO_RCVBUF + // I set the read_buffer size simillar to SO_RCVBUF // Haven't tested with a lower value to see its better or worse _readBuf = new byte[_readBufferSize]; try @@ -148,9 +143,6 @@ public class IoHandler implements Runnable ByteBuffer b = ByteBuffer.allocate(read); b.put(_readBuf,0,read); b.flip(); - //byte[] temp = new byte[read]; - //System.arraycopy(_readBuf, 0,temp, 0, read); - //ByteBuffer b = ByteBuffer.wrap(temp); _receiver.received(b); } } @@ -177,10 +169,12 @@ public class IoHandler implements Runnable } } + /** + * Will experiment in a future version with batching + */ public static void startBatchingFrames(int connectionId) { - IoSender sender = _handlers.get(connectionId); - sender.setStartBatching(); + } diff --git a/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/io/IoSender.java b/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/io/IoSender.java index 72bfb3c9d4..1adde531a6 100644 --- a/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/io/IoSender.java +++ b/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/io/IoSender.java @@ -21,20 +21,14 @@ package org.apache.qpidity.transport.network.io; import java.io.IOException; import java.io.OutputStream; import java.net.Socket; -import java.nio.ByteBuffer; import org.apache.qpidity.transport.Sender; -import org.apache.qpidity.transport.util.Logger; public class IoSender implements Sender<java.nio.ByteBuffer> { private final Object lock = new Object(); private Socket _socket; private OutputStream _outStream; - private boolean _batch = false; - private ByteBuffer _buffer; - - private static final Logger log = Logger.get(IoHandler.class); public IoSender(Socket socket) { @@ -92,26 +86,17 @@ public class IoSender implements Sender<java.nio.ByteBuffer> /* * Haven't used this, but the intention is - * to experiment with it yet. + * to experiment with it in the future. * Also need to make sure the buffer size * is configurable */ public void setStartBatching() { - _batch = true; - try - { - _buffer = ByteBuffer.allocate(2048); - } - catch(Exception e) - { - throw new RuntimeException("Unable to set SO_SNDBUF due to socket error",e); - } } public void close() { - synchronized (lock) + synchronized (lock) { try { |