[Red5commits] [1711] fixed NPE on disconnect (Jira APPSERVER-49)

[jbauch]

fixed NPE on disconnect (Jira APPSERVER-49)


Timestamp: 02/09/07 17:35:17 EST (less than one hour ago) 
Change: 1711 
Author: jbauch

Files (see diff or trac for details): 
java/server/trunk/src/org/red5/server/so/SharedObjectScope.java


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

Index: /java/server/trunk/src/org/red5/server/so/SharedObjectScope.java
===================================================================
--- /java/server/trunk/src/org/red5/server/so/SharedObjectScope.java (revision 1698)
+++ /java/server/trunk/src/org/red5/server/so/SharedObjectScope.java (revision 1711)
@@ -290,5 +290,5 @@
 		so.unregister(listener);
 		super.removeEventListener(listener);
-		if (!so.isPersistentObject() && so.getListeners().isEmpty()) {
+		if (!so.isPersistentObject() && (so.getListeners() == null || so.getListeners().isEmpty())) {
 			getParent().removeChildScope(this);
 		}


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