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 2007/09/20 17:05:58 UTC
svn commit: r577785 - in
/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network:
InputHandler.java OutputHandler.java
Author: rhs
Date: Thu Sep 20 08:05:57 2007
New Revision: 577785
URL: http://svn.apache.org/viewvc?rev=577785&view=rev
Log:
added frame-end constant
Modified:
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/InputHandler.java
incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/OutputHandler.java
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/InputHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/InputHandler.java?rev=577785&r1=577784&r2=577785&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/InputHandler.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/InputHandler.java Thu Sep 20 08:05:57 2007
@@ -22,6 +22,7 @@
import java.nio.ByteBuffer;
+import org.apache.qpidity.transport.Constant;
import org.apache.qpidity.transport.ProtocolError;
import org.apache.qpidity.transport.ProtocolHeader;
import org.apache.qpidity.transport.Receiver;
@@ -62,6 +63,7 @@
FRAME_HDR_RSVD5,
FRAME_PAYLOAD,
FRAME_FRAGMENT,
+ FRAME_END,
ERROR;
}
@@ -189,7 +191,7 @@
buf.position(buf.position() + size);
frame.addFragment(payload);
frame();
- return FRAME_HDR;
+ return FRAME_END;
}
case FRAME_FRAGMENT:
int delta = size - frame.getSize();
@@ -203,8 +205,10 @@
buf.position(buf.position() + delta);
frame.addFragment(fragment);
frame();
- return FRAME_HDR;
+ return FRAME_END;
}
+ case FRAME_END:
+ return expect(buf, Constant.FRAME_END, FRAME_HDR);
default:
throw new IllegalStateException();
}
Modified: incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/OutputHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/OutputHandler.java?rev=577785&r1=577784&r2=577785&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/OutputHandler.java (original)
+++ incubator/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpidity/transport/network/OutputHandler.java Thu Sep 20 08:05:57 2007
@@ -22,6 +22,7 @@
import java.nio.ByteBuffer;
+import org.apache.qpidity.transport.Constant;
import org.apache.qpidity.transport.ProtocolError;
import org.apache.qpidity.transport.ProtocolHeader;
import org.apache.qpidity.transport.Sender;
@@ -88,6 +89,10 @@
{
sender.send(buf);
}
+ ByteBuffer end = ByteBuffer.allocate(1);
+ end.put((byte) Constant.FRAME_END);
+ end.flip();
+ sender.send(end);
}
}