[Red5commits] [712] jbauch

[luke@codegent.com]

fixed NullPointerException?


Timestamp: 04/16/06 01:25:19 (less than one hour ago) 
Change: 712 
Author: jbauch

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


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

Index: /java/server/trunk/src/org/red5/server/Scope.java
===================================================================
--- /java/server/trunk/src/org/red5/server/Scope.java (revision 706)
+++ /java/server/trunk/src/org/red5/server/Scope.java (revision 712)
@@ -324,6 +324,6 @@
 		
 		private Iterator setIterator; 
-		private Iterator connIterator;
-		private IConnection current;
+		private Iterator connIterator = null;
+		private IConnection current = null;
 		
 		public ConnectionIterator(){
@@ -332,9 +332,9 @@
 		
 		public boolean hasNext() {
-			return connIterator.hasNext() || setIterator.hasNext();
+			return (connIterator != null && connIterator.hasNext()) || setIterator.hasNext();
 		}
 
 		public IConnection next() {
-			if(!connIterator.hasNext()){
+			if (connIterator == null || !connIterator.hasNext()){
 				if(!setIterator.hasNext()) return null;
 				connIterator = ((Set) setIterator.next()).iterator();