svn commit: r1786328 - in /openmeetings/application: branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ trunk/openmeetin...

[solomax]

Author: solomax
Date: Fri Mar 10 11:57:32 2017
New Revision: 1786328

URL: http://svn.apache.org/viewvc?rev=1786328&view=rev
Log:
[OPENMEETINGS-1598] screen-sharing stopped if client exit the room

Modified:
    
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
    
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
    
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
    
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java

Modified: 
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java?rev=1786328&r1=1786327&r2=1786328&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
 (original)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
 Fri Mar 10 11:57:32 2017
@@ -415,6 +415,8 @@ public class Core implements IPendingSer
                                        frame.setStatus("" + 
params.get("error"));
                                }
                        }
+               } else if ("stopStream".equals(method)) {
+                       sharingStop();
                }
        }
 

Modified: 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java?rev=1786328&r1=1786327&r2=1786328&view=diff
==============================================================================
--- 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
 (original)
+++ 
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
 Fri Mar 10 11:57:32 2017
@@ -131,7 +131,7 @@ public class ConnectionsPanel extends Ad
 
                        @Override
                        public Iterator<? extends 
org.apache.openmeetings.db.entity.basic.Client> iterator(long first, long 
count) {
-                               
List<org.apache.openmeetings.db.entity.basic.Client> l = new 
ArrayList<>(Application.getClients());
+                               
List<org.apache.openmeetings.db.entity.basic.Client> l = 
Application.getClients();
                                return l.subList((int)Math.max(0, first), 
(int)Math.min(first + count, l.size())).iterator();
                        }
 

Modified: 
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java?rev=1786328&r1=1786327&r2=1786328&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/Core.java
 Fri Mar 10 11:57:32 2017
@@ -415,6 +415,8 @@ public class Core implements IPendingSer
                                        frame.setStatus("" + 
params.get("error"));
                                }
                        }
+               } else if ("stopStream".equals(method)) {
+                       sharingStop();
                }
        }
 

Modified: 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
URL: 
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java?rev=1786328&r1=1786327&r2=1786328&view=diff
==============================================================================
--- 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
 (original)
+++ 
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
 Fri Mar 10 11:57:32 2017
@@ -131,7 +131,7 @@ public class ConnectionsPanel extends Ad
 
                        @Override
                        public Iterator<? extends 
org.apache.openmeetings.db.entity.basic.Client> iterator(long first, long 
count) {
-                               
List<org.apache.openmeetings.db.entity.basic.Client> l = new 
ArrayList<>(Application.getClients());
+                               
List<org.apache.openmeetings.db.entity.basic.Client> l = 
Application.getClients();
                                return l.subList((int)Math.max(0, first), 
(int)Math.min(first + count, l.size())).iterator();
                        }