You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2013/10/24 17:17:06 UTC
svn commit: r1535409 -
/qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/impl/AmqpTransport.java
Author: rhs
Date: Thu Oct 24 15:17:06 2013
New Revision: 1535409
URL: http://svn.apache.org/r1535409
Log:
PROTON-428: applied patch from bozo
Modified:
qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/impl/AmqpTransport.java
Modified: qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/impl/AmqpTransport.java
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/impl/AmqpTransport.java?rev=1535409&r1=1535408&r2=1535409&view=diff
==============================================================================
--- qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/impl/AmqpTransport.java (original)
+++ qpid/proton/trunk/proton-j/contrib/proton-hawtdispatch/src/main/java/org/apache/qpid/proton/hawtdispatch/impl/AmqpTransport.java Thu Oct 24 15:17:06 2013
@@ -21,6 +21,7 @@ import org.apache.qpid.proton.hawtdispat
import org.apache.qpid.proton.hawtdispatch.api.ChainedCallback;
import org.apache.qpid.proton.hawtdispatch.api.TransportState;
import org.apache.qpid.proton.engine.*;
+import org.apache.qpid.proton.engine.impl.ByteBufferUtils;
import org.apache.qpid.proton.engine.impl.EngineFactoryImpl;
import org.apache.qpid.proton.engine.impl.ProtocolTracer;
import org.fusesource.hawtbuf.Buffer;
@@ -34,6 +35,7 @@ import org.fusesource.hawtdispatch.trans
import java.io.IOException;
import java.net.URI;
+import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashSet;
@@ -468,7 +470,12 @@ public class AmqpTransport extends Watch
} else {
buffer = (Buffer) command;
}
- protonTransport.input(buffer.data, buffer.offset, buffer.length);
+ ByteBuffer bbuffer = buffer.toByteBuffer();
+ do {
+ ByteBuffer input = protonTransport.getInputBuffer();
+ ByteBufferUtils.pour(bbuffer, input);
+ protonTransport.processInput();
+ } while (bbuffer.remaining() > 0);
process();
pumpOut();
} catch (Exception e) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org