[Red5commits] [2215] make sure last decoded packet is properly reset

[jbauch]

make sure last decoded packet is properly reset


Timestamp: 07/17/07 08:12:24 EST (less than one hour ago) 
Change: 2215 
Author: jbauch

Files (see diff or trac for details): 
java/server/trunk/src/org/red5/server/net/rtmp/codec/RTMPProtocolDecoder.java


Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/2215

Index: /java/server/trunk/src/org/red5/server/net/rtmp/codec/RTMPProtocolDecoder.java
===================================================================
--- /java/server/trunk/src/org/red5/server/net/rtmp/codec/RTMPProtocolDecoder.java (revision 2204)
+++ /java/server/trunk/src/org/red5/server/net/rtmp/codec/RTMPProtocolDecoder.java (revision 2215)
@@ -403,12 +403,15 @@
 		buf.flip();
 
-		final IRTMPEvent message = decodeMessage(rtmp, packet.getHeader(), buf);
-		packet.setMessage(message);
-
-		if (message instanceof ChunkSize) {
-			ChunkSize chunkSizeMsg = (ChunkSize) message;
-			rtmp.setReadChunkSize(chunkSizeMsg.getSize());
-		}
-		rtmp.setLastReadPacket(channelId, null);
+		try {
+			final IRTMPEvent message = decodeMessage(rtmp, packet.getHeader(), buf);
+			packet.setMessage(message);
+	
+			if (message instanceof ChunkSize) {
+				ChunkSize chunkSizeMsg = (ChunkSize) message;
+				rtmp.setReadChunkSize(chunkSizeMsg.getSize());
+			}
+		} finally {
+			rtmp.setLastReadPacket(channelId, null);
+		}
 		return packet;
 


Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.