[Red5commits] [2417] don't try to decode objects for closed connections (Jira APPSERVER-208)
jbauch
luke at codegent.com
Mon Oct 22 04:00:24 PDT 2007
don't try to decode objects for closed connections (Jira APPSERVER-208)
Timestamp: 10/22/07 06:00:03 EST (less than one hour ago)
Change: 2417
Author: jbauch
Files (see diff or trac for details):
doc/trunk/changelog.txt
java/server/trunk/src/org/red5/server/net/rtmpt/RTMPTConnection.java
Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/2417
Index: /java/server/trunk/src/org/red5/server/net/rtmpt/RTMPTConnection.java
===================================================================
--- /java/server/trunk/src/org/red5/server/net/rtmpt/RTMPTConnection.java (revision 2397)
+++ /java/server/trunk/src/org/red5/server/net/rtmpt/RTMPTConnection.java (revision 2417)
@@ -20,4 +20,5 @@
*/
+import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
@@ -115,5 +116,5 @@
* Closing flag
*/
- protected boolean closing;
+ volatile protected boolean closing;
/**
* Connection client id
@@ -255,4 +256,9 @@
*/
public List decode(ByteBuffer data) {
+ if (closing || state.getState() == RTMP.STATE_DISCONNECTED) {
+ // Connection is being closed, don't decode any new packets
+ return Collections.EMPTY_LIST;
+ }
+
Red5.setConnectionLocal(this);
readBytes += data.limit();
Index: /doc/trunk/changelog.txt
===================================================================
--- /doc/trunk/changelog.txt (revision 2409)
+++ /doc/trunk/changelog.txt (revision 2417)
@@ -17,4 +17,5 @@
- "onMetaData" is only written to newly recorded FLV files and contains
valid properties now
+- don't try to decode objects for closed connections (Jira APPSERVER-208)
Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.
More information about the Red5commits
mailing list