[jira] [Created] (OPENMEETINGS-1838) Video And Audio Aren't synchronized

2018-03-07 Thread LUIZ AUGUSTO MACHADO DOS SANTOS (JIRA) 
LUIZ AUGUSTO MACHADO DOS SANTOS created OPENMEETINGS-1838:
-

 Summary: Video And Audio Aren't synchronized 
 Key: OPENMEETINGS-1838
 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1838
 Project: Openmeetings
  Issue Type: Bug
  Components: Audio/Video
Affects Versions: 4.0.2
Reporter: LUIZ AUGUSTO MACHADO DOS SANTOS
Assignee: Maxim Solodovnik


The audio and video of the record are not synchronized the image is almost 7 
seconds late in related to the audio. 



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Created] (OPENMEETINGS-1841) List Of All Groups and Group is not Deleted

2018-03-07 Thread Tushar Shinde (JIRA) 
Tushar Shinde created OPENMEETINGS-1841:
---

 Summary: List Of All Groups and Group is not Deleted
 Key: OPENMEETINGS-1841
 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1841
 Project: Openmeetings
  Issue Type: Bug
  Components: SOAP/REST API
Affects Versions: 4.0.2
Reporter: Tushar Shinde
Assignee: Maxim Solodovnik
 Fix For: 4.0.2


 *Following is the given API for List Of All Groups:*
@GET
 @Path(value="/")
public List get(@QueryParam(value="sid")
  String sid)
Get the list of all groups

URL://group?sid=f724670a-5006-449e-8990-608637852a50

It will not work on Restlet (it will showing the 500 Error) and also it will 
not showing the list of all group present in OPenMeetings.

*Following is the API for Deleting Group:*
@DELETE
 @Path(value="/{id}")
public ServiceResult delete(@QueryParam(value="sid")
  String sid,
  @PathParam(value="id")
  long id)

URL: /group/13?sid=f724670a-5006-449e-8990-608637852a50

Group is not Deleted by Group ID.

*What is the Requirement to solve this two isses.*



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Created] (OPENMEETINGS-1842) Add User API Problem

2018-03-07 Thread Tushar Shinde (JIRA) 
Tushar Shinde created OPENMEETINGS-1842:
---

 Summary: Add User API Problem
 Key: OPENMEETINGS-1842
 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1842
 Project: Openmeetings
  Issue Type: Bug
  Components: SOAP/REST API
Affects Versions: 4.0.2
Reporter: Tushar Shinde
Assignee: Maxim Solodovnik
 Fix For: 4.0.2


Given API to Add User :
@POST
 @Path(value="/")
public UserDTO add(@QueryParam(value="sid")
   String sid,
   @FormParam(value="user")
   UserDTO user,
   @FormParam(value="confirm")
   Boolean confirm)

URL: /user?sid="+sid 

Problem in API Call : In UserDTO, External id and External type are unknown 
values.
How to set the External Id and External Type for the User.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[openmeetings] branch OPENMEETINGS-1649-kurento updated: [OPENMEETINGS-1837] audio-only steams are being recorded as expected

2018-03-07 Thread solomax 
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch OPENMEETINGS-1649-kurento
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/OPENMEETINGS-1649-kurento by 
this push:
 new 2b75a61  [OPENMEETINGS-1837] audio-only steams are being recorded as 
expected
2b75a61 is described below

commit 2b75a6173c6a5b835e28436684f8806a9d675f05
Author: Maxim Solodovnik 
AuthorDate: Thu Mar 8 11:11:22 2018 +0700

[OPENMEETINGS-1837] audio-only steams are being recorded as expected
---
 .../apache/openmeetings/core/converter/InterviewConverter.java| 4 ++--
 .../apache/openmeetings/core/remote/ScopeApplicationAdapter.java  | 4 +++-
 .../java/org/apache/openmeetings/web/app/StreamClientManager.java | 8 ++--
 .../java/org/apache/openmeetings/web/room/RoomBroadcaster.java| 2 --
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
index 3e87277..cdaa4c5 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
@@ -100,7 +100,7 @@ public class InterviewConverter extends BaseConverter 
implements IRecordingConve
Recording r = null;
try {
r = recordingDao.get(id);
-   log.debug("recording " + r.getId());
+   log.debug("recording {}", r.getId());
if (Strings.isEmpty(r.getHash())) {
r.setHash(UUID.randomUUID().toString());
}
@@ -172,7 +172,7 @@ public class InterviewConverter extends BaseConverter 
implements IRecordingConve
, "-v", "error"
, "-f", "null"
, "file.null"};
-   ProcessResult res = 
ProcessHelper.executeScript("checkFlvPod_" + pod , args);
+   ProcessResult res = 
ProcessHelper.executeScript("checkFlvPod_" + pod , args, true);
logs.add(res);
if (res.isOk()) {
long diff = 
diff(meta.getRecordStart(), meta.getRecording().getRecordStart());
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
index 5fd61f7..967faed 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
@@ -470,7 +470,9 @@ public class ScopeApplicationAdapter /*extends 
MultiThreadedApplicationAdapter i
c.setBroadcastId(streamName);
 
if (Client.Type.sharing != c.getType() && 
Client.Type.mobile != c.getType()) {
-   c.setAvsettings("av");
+   if (Strings.isEmpty(c.getAvsettings()) || 
"n".equals(c.getAvsettings())) {
+   c.setAvsettings("av");
+   }
c.setBroadcasting(true);
if (c.getWidth() == 0 || c.getHeight() == 0) {
c.setWidth(320);
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/StreamClientManager.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/StreamClientManager.java
index a9c6b00..8280eac 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/StreamClientManager.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/StreamClientManager.java
@@ -71,6 +71,8 @@ public class StreamClientManager implements 
IStreamClientManager {
@Autowired
private ClientManager clientManager;
@Autowired
+   private StreamClientManager streamClientManager;
+   @Autowired
private SessiondataDao sessionDao;
@Autowired
private UserDao userDao;
@@ -178,10 +180,10 @@ public class StreamClientManager implements 
IStreamClientManager {
rcl.setEmail(u.getAddress() == null ? null : 
u.getAddress().getEmail());
rcl.setSuperMod(client.hasRight(Right.superModerator));
rcl.setMod(client.hasRight(Right.moderator));
-   if

[jira] [Commented] (OPENMEETINGS-1837) Audio isn't recording but the video is ok

2018-03-07 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1837?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16390717#comment-16390717
 ] 

ASF subversion and git services commented on OPENMEETINGS-1837:
---

Commit 2b75a6173c6a5b835e28436684f8806a9d675f05 in openmeetings's branch 
refs/heads/OPENMEETINGS-1649-kurento from [~solomax]
[ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=2b75a61 ]

[OPENMEETINGS-1837] audio-only steams are being recorded as expected


> Audio isn't recording but the video is ok
> -
>
> Key: OPENMEETINGS-1837
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1837
> Project: Openmeetings
>  Issue Type: Bug
>  Components: Audio/Video
>Affects Versions: 4.0.2
>Reporter: LUIZ AUGUSTO MACHADO DOS SANTOS
>Assignee: Maxim Solodovnik
>Priority: Major
> Fix For: 4.0.3
>
>
> Hi, the audio when we turn of the webcan stop to record. we only can record 
> the audio if the webcan is on. we are using it on Egde because we do not have 
> SSL yet. Our codecs are ok. 
> ffmpeg
> ffmpeg version 3.1.1 Copyright (c) 2000-2016 the FFmpeg developers
>  built with gcc 4.4.7 (GCC) 20120313 (Red Hat 4.4.7-18)
>  configuration: --prefix=/home/emmakes/ffmpeg_build 
> --extra-cflags=-I/home/emmakes/ffmpeg_build/include 
> --extra-ldflags=-L/home/emmakes/ffmpeg_build/lib --bindir=/home/emmakes/bin 
> --pkg-config-flags=--static --enable-gpl --enable-nonfree --enable-libfdk_aac 
> --enable-libfreetype --enable-libmp3lame --enable-libopus --enable-libvorbis 
> --enable-libvpx --enable-libx264 --enable-libx265 --enable-libtheora
>  libavutil 55. 28.100 / 55. 28.100
>  libavcodec 57. 48.101 / 57. 48.101
>  libavformat 57. 41.100 / 57. 41.100
>  libavdevice 57. 0.101 / 57. 0.101
>  libavfilter 6. 47.100 / 6. 47.100
>  libswscale 4. 1.100 / 4. 1.100
>  libswresample 2. 1.100 / 2. 1.100
>  libpostproc 54. 0.100 / 54. 0.100
> Hyper fast Audio and Video encoder
> usage: ffmpeg [options] [[infile options] -i infile]... \{[outfile options] 
> outfile}... 



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Created] (OPENMEETINGS-1840) Add Group in Room

2018-03-07 Thread Tushar (JIRA) 
Tushar created OPENMEETINGS-1840:


 Summary: Add Group in Room
 Key: OPENMEETINGS-1840
 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1840
 Project: Openmeetings
  Issue Type: Bug
  Components: HTML5/Room
Affects Versions: 4.0.2
Reporter: Tushar
Assignee: Maxim Solodovnik
 Fix For: 4.0.2


Heading: Add Group in API
as given group API -
@Path(value="/{id}/rooms/add/{roomId}")
public ServiceResult addRoom(@QueryParam(value="sid")

String sid,

@PathParam(value="id")

Long id,

@PathParam(value="roomid")

Long roomid)

I execute this -
url://group/4/rooms/add/55?sid=78d44e7a-e47e-4b90-b4fb-112b415c7cb6
For Every GroupID or RoomID it will give message Not Added.
What is the requirement to execute this API or how to add room in group through 
API calls.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Updated] (OPENMEETINGS-1840) Add Group in Room

2018-03-07 Thread Tushar Shinde (JIRA) 

 [ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1840?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Tushar Shinde updated OPENMEETINGS-1840:

Component/s: (was: HTML5/Room)
 SOAP/REST API

> Add Group in Room
> -
>
> Key: OPENMEETINGS-1840
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1840
> Project: Openmeetings
>  Issue Type: Bug
>  Components: SOAP/REST API
>Affects Versions: 4.0.2
>Reporter: Tushar Shinde
>Assignee: Maxim Solodovnik
>Priority: Critical
> Fix For: 4.0.2
>
>
> Heading: Add Group in API
> as given group API -
> @Path(value="/{id}/rooms/add/{roomId}")
> public ServiceResult addRoom(@QueryParam(value="sid")
> 
> String sid,
> 
> @PathParam(value="id")
> 
> Long id,
> 
> @PathParam(value="roomid")
> 
> Long roomid)
> I execute this -
> url://group/4/rooms/add/55?sid=78d44e7a-e47e-4b90-b4fb-112b415c7cb6
> For Every GroupID or RoomID it will give message Not Added.
> What is the requirement to execute this API or how to add room in group 
> through API calls.



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Commented] (OPENMEETINGS-1838) Video And Audio Aren't synchronized

2018-03-07 Thread Maxim Solodovnik (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1838?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16390719#comment-16390719
 ] 

Maxim Solodovnik commented on OPENMEETINGS-1838:


What type of room are you using for your tests?

Is it reproducible in "interview" room? Is it reproducible on our demo server 
https://om.alteametasoft.com/openmeetings/?

> Video And Audio Aren't synchronized 
> 
>
> Key: OPENMEETINGS-1838
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1838
> Project: Openmeetings
>  Issue Type: Bug
>  Components: Audio/Video
>Affects Versions: 4.0.2
>Reporter: LUIZ AUGUSTO MACHADO DOS SANTOS
>Assignee: Maxim Solodovnik
>Priority: Major
>
> The audio and video of the record are not synchronized the image is almost 7 
> seconds late in related to the audio. 



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Created] (OPENMEETINGS-1843) User Type and Assigning SOAP Right

2018-03-07 Thread Tushar Shinde (JIRA) 
Tushar Shinde created OPENMEETINGS-1843:
---

 Summary: User Type and Assigning SOAP Right 
 Key: OPENMEETINGS-1843
 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1843
 Project: Openmeetings
  Issue Type: Bug
  Components: SOAP/REST API
Affects Versions: 4.0.2
Reporter: Tushar Shinde
Assignee: Maxim Solodovnik
 Fix For: 4.0.2


Given API to Add User :
@POST
 @Path(value="/")
public UserDTO add(@QueryParam(value="sid")
   String sid,
   @FormParam(value="user")
   UserDTO user,
   @FormParam(value="confirm")
   Boolean confirm)

URL: /user?sid="+sid 
 *Problem:*
In UserDTO can not assign value of "user type" as user or external and not able 
to assign "SOAP" right. 




--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Updated] (OPENMEETINGS-1837) Audio isn't recording but the video is ok

2018-03-07 Thread Maxim Solodovnik (JIRA) 

 [ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1837?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Maxim Solodovnik updated OPENMEETINGS-1837:
---
Fix Version/s: 4.0.3

> Audio isn't recording but the video is ok
> -
>
> Key: OPENMEETINGS-1837
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1837
> Project: Openmeetings
>  Issue Type: Bug
>  Components: Audio/Video
>Affects Versions: 4.0.2
>Reporter: LUIZ AUGUSTO MACHADO DOS SANTOS
>Assignee: Maxim Solodovnik
>Priority: Major
> Fix For: 4.0.3
>
>
> Hi, the audio when we turn of the webcan stop to record. we only can record 
> the audio if the webcan is on. we are using it on Egde because we do not have 
> SSL yet. Our codecs are ok. 
> ffmpeg
> ffmpeg version 3.1.1 Copyright (c) 2000-2016 the FFmpeg developers
>  built with gcc 4.4.7 (GCC) 20120313 (Red Hat 4.4.7-18)
>  configuration: --prefix=/home/emmakes/ffmpeg_build 
> --extra-cflags=-I/home/emmakes/ffmpeg_build/include 
> --extra-ldflags=-L/home/emmakes/ffmpeg_build/lib --bindir=/home/emmakes/bin 
> --pkg-config-flags=--static --enable-gpl --enable-nonfree --enable-libfdk_aac 
> --enable-libfreetype --enable-libmp3lame --enable-libopus --enable-libvorbis 
> --enable-libvpx --enable-libx264 --enable-libx265 --enable-libtheora
>  libavutil 55. 28.100 / 55. 28.100
>  libavcodec 57. 48.101 / 57. 48.101
>  libavformat 57. 41.100 / 57. 41.100
>  libavdevice 57. 0.101 / 57. 0.101
>  libavfilter 6. 47.100 / 6. 47.100
>  libswscale 4. 1.100 / 4. 1.100
>  libswresample 2. 1.100 / 2. 1.100
>  libpostproc 54. 0.100 / 54. 0.100
> Hyper fast Audio and Video encoder
> usage: ffmpeg [options] [[infile options] -i infile]... \{[outfile options] 
> outfile}... 



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Created] (OPENMEETINGS-1839) Unable to locate the dropdown choices: audio + video, audio only, video only, picture only.

2018-03-07 Thread Morrell Aberdeen (JIRA) 
Morrell Aberdeen created OPENMEETINGS-1839:
--

 Summary: Unable to locate the dropdown choices: audio + video, 
audio only,  video only,  picture only.
 Key: OPENMEETINGS-1839
 URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1839
 Project: Openmeetings
  Issue Type: Bug
Affects Versions: 4.0.2
Reporter: Morrell Aberdeen
Assignee: Maxim Solodovnik


Have they been removed?



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Resolved] (OPENMEETINGS-1839) Unable to locate the dropdown choices: audio + video, audio only, video only, picture only.

2018-03-07 Thread Maxim Solodovnik (JIRA) 

 [ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1839?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Maxim Solodovnik resolved OPENMEETINGS-1839.

Resolution: Information Provided

Hello Morrell,

The dialog has been re-organized
each audio and video can be "disabled"

so
audio+video => "audio device selected" AND "video device selected"
audio only=> "audio device selected" AND "video disabled"
video only=> "video device selected" AND "audio disabled"

there is no "picture only" mode anymore, I'm afraid it always was buggy ...

Please ask questions on user@ mailing list: 
http://openmeetings.apache.org/mail-lists.html (need to subscribe first) :))

> Unable to locate the dropdown choices: audio + video, audio only,  video 
> only,  picture only.
> -
>
> Key: OPENMEETINGS-1839
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1839
> Project: Openmeetings
>  Issue Type: Bug
>Affects Versions: 4.0.2
>Reporter: Morrell Aberdeen
>Assignee: Maxim Solodovnik
>Priority: Major
>
> Have they been removed?



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Commented] (OPENMEETINGS-1837) Audio isn't recording but the video is ok

2018-03-07 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1837?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16390714#comment-16390714
 ] 

ASF subversion and git services commented on OPENMEETINGS-1837:
---

Commit d216f573faec210a58c344c83f2030d891d8db58 in openmeetings's branch 
refs/heads/4.0.x from [~solomax]
[ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=d216f57 ]

[OPENMEETINGS-1837] audio-only steams are being recorded as expected


> Audio isn't recording but the video is ok
> -
>
> Key: OPENMEETINGS-1837
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1837
> Project: Openmeetings
>  Issue Type: Bug
>  Components: Audio/Video
>Affects Versions: 4.0.2
>Reporter: LUIZ AUGUSTO MACHADO DOS SANTOS
>Assignee: Maxim Solodovnik
>Priority: Major
> Fix For: 4.0.3
>
>
> Hi, the audio when we turn of the webcan stop to record. we only can record 
> the audio if the webcan is on. we are using it on Egde because we do not have 
> SSL yet. Our codecs are ok. 
> ffmpeg
> ffmpeg version 3.1.1 Copyright (c) 2000-2016 the FFmpeg developers
>  built with gcc 4.4.7 (GCC) 20120313 (Red Hat 4.4.7-18)
>  configuration: --prefix=/home/emmakes/ffmpeg_build 
> --extra-cflags=-I/home/emmakes/ffmpeg_build/include 
> --extra-ldflags=-L/home/emmakes/ffmpeg_build/lib --bindir=/home/emmakes/bin 
> --pkg-config-flags=--static --enable-gpl --enable-nonfree --enable-libfdk_aac 
> --enable-libfreetype --enable-libmp3lame --enable-libopus --enable-libvorbis 
> --enable-libvpx --enable-libx264 --enable-libx265 --enable-libtheora
>  libavutil 55. 28.100 / 55. 28.100
>  libavcodec 57. 48.101 / 57. 48.101
>  libavformat 57. 41.100 / 57. 41.100
>  libavdevice 57. 0.101 / 57. 0.101
>  libavfilter 6. 47.100 / 6. 47.100
>  libswscale 4. 1.100 / 4. 1.100
>  libswresample 2. 1.100 / 2. 1.100
>  libpostproc 54. 0.100 / 54. 0.100
> Hyper fast Audio and Video encoder
> usage: ffmpeg [options] [[infile options] -i infile]... \{[outfile options] 
> outfile}... 



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1837] audio-only steams are being recorded as expected

2018-03-07 Thread solomax 
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/4.0.x by this push:
 new d216f57  [OPENMEETINGS-1837] audio-only steams are being recorded as 
expected
d216f57 is described below

commit d216f573faec210a58c344c83f2030d891d8db58
Author: Maxim Solodovnik 
AuthorDate: Thu Mar 8 11:11:22 2018 +0700

[OPENMEETINGS-1837] audio-only steams are being recorded as expected
---
 .../openmeetings/core/converter/InterviewConverter.java|  4 ++--
 .../openmeetings/core/remote/ScopeApplicationAdapter.java  |  4 +++-
 .../org/apache/openmeetings/web/app/ClientManager.java |  8 
 .../org/apache/openmeetings/web/app/QuickPollManager.java  |  2 +-
 .../apache/openmeetings/web/app/StreamClientManager.java   |  8 ++--
 .../org/apache/openmeetings/web/app/WhiteboardManager.java | 14 +++---
 .../org/apache/openmeetings/web/room/RoomBroadcaster.java  |  2 --
 7 files changed, 23 insertions(+), 19 deletions(-)

diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
index 97278f8..d70ad06 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
@@ -101,7 +101,7 @@ public class InterviewConverter extends BaseConverter 
implements IRecordingConve
Recording r = null;
try {
r = recordingDao.get(id);
-   log.debug("recording " + r.getId());
+   log.debug("recording {}", r.getId());
if (Strings.isEmpty(r.getHash())) {
r.setHash(UUID.randomUUID().toString());
}
@@ -173,7 +173,7 @@ public class InterviewConverter extends BaseConverter 
implements IRecordingConve
, "-v", "error"
, "-f", "null"
, "file.null"};
-   ProcessResult res = 
ProcessHelper.executeScript("checkFlvPod_" + pod , args);
+   ProcessResult res = 
ProcessHelper.executeScript("checkFlvPod_" + pod , args, true);
logs.add(res);
if (res.isOk()) {
long diff = 
diff(meta.getRecordStart(), meta.getRecording().getRecordStart());
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
index b06e0af..000e74a 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
@@ -494,7 +494,9 @@ public class ScopeApplicationAdapter extends 
MultiThreadedApplicationAdapter imp
c.setBroadcastId(streamName);
 
if (Client.Type.sharing != c.getType() && 
Client.Type.mobile != c.getType()) {
-   c.setAvsettings("av");
+   if (Strings.isEmpty(c.getAvsettings()) || 
"n".equals(c.getAvsettings())) {
+   c.setAvsettings("av");
+   }
c.setBroadcasting(true);
if (c.getWidth() == 0 || c.getHeight() == 0) {
c.setWidth(320);
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
index df177c8..b896e00 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
@@ -59,15 +59,15 @@ public class ClientManager implements IClientManager {
@Autowired
private ScopeApplicationAdapter scopeAdapter;
 
-   private Map map() {
+   private static Map map() {
return getHazelcast().getMap(ONLINE_USERS_KEY);
}
 
-   private Map mapUidBySid() {
+   private static Map mapUidBySid() {
return getHazelcast().getMap(UID_BY_SID_KEY);
}
 
-   private IMap getRooms() {
+   private

[openmeetings] branch master updated: [OPENMEETINGS-1837] audio-only steams are being recorded as expected

2018-03-07 Thread solomax 
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
 new 15822a7  [OPENMEETINGS-1837] audio-only steams are being recorded as 
expected
15822a7 is described below

commit 15822a7549bc8b644bd1bb751fde4f14479e7a55
Author: Maxim Solodovnik 
AuthorDate: Thu Mar 8 11:11:22 2018 +0700

[OPENMEETINGS-1837] audio-only steams are being recorded as expected
---
 .../openmeetings/core/converter/InterviewConverter.java|  4 ++--
 .../openmeetings/core/remote/ScopeApplicationAdapter.java  |  4 +++-
 .../org/apache/openmeetings/web/app/ClientManager.java |  8 
 .../org/apache/openmeetings/web/app/QuickPollManager.java  |  2 +-
 .../apache/openmeetings/web/app/StreamClientManager.java   |  8 ++--
 .../org/apache/openmeetings/web/app/WhiteboardManager.java | 14 +++---
 .../org/apache/openmeetings/web/room/RoomBroadcaster.java  |  2 --
 7 files changed, 23 insertions(+), 19 deletions(-)

diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
index 97278f8..d70ad06 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/converter/InterviewConverter.java
@@ -101,7 +101,7 @@ public class InterviewConverter extends BaseConverter 
implements IRecordingConve
Recording r = null;
try {
r = recordingDao.get(id);
-   log.debug("recording " + r.getId());
+   log.debug("recording {}", r.getId());
if (Strings.isEmpty(r.getHash())) {
r.setHash(UUID.randomUUID().toString());
}
@@ -173,7 +173,7 @@ public class InterviewConverter extends BaseConverter 
implements IRecordingConve
, "-v", "error"
, "-f", "null"
, "file.null"};
-   ProcessResult res = 
ProcessHelper.executeScript("checkFlvPod_" + pod , args);
+   ProcessResult res = 
ProcessHelper.executeScript("checkFlvPod_" + pod , args, true);
logs.add(res);
if (res.isOk()) {
long diff = 
diff(meta.getRecordStart(), meta.getRecording().getRecordStart());
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
index b06e0af..000e74a 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ScopeApplicationAdapter.java
@@ -494,7 +494,9 @@ public class ScopeApplicationAdapter extends 
MultiThreadedApplicationAdapter imp
c.setBroadcastId(streamName);
 
if (Client.Type.sharing != c.getType() && 
Client.Type.mobile != c.getType()) {
-   c.setAvsettings("av");
+   if (Strings.isEmpty(c.getAvsettings()) || 
"n".equals(c.getAvsettings())) {
+   c.setAvsettings("av");
+   }
c.setBroadcasting(true);
if (c.getWidth() == 0 || c.getHeight() == 0) {
c.setWidth(320);
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
index df177c8..b896e00 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/ClientManager.java
@@ -59,15 +59,15 @@ public class ClientManager implements IClientManager {
@Autowired
private ScopeApplicationAdapter scopeAdapter;
 
-   private Map map() {
+   private static Map map() {
return getHazelcast().getMap(ONLINE_USERS_KEY);
}
 
-   private Map mapUidBySid() {
+   private static Map mapUidBySid() {
return getHazelcast().getMap(UID_BY_SID_KEY);
}
 
-   private IMap getRooms() {
+   private

[jira] [Commented] (OPENMEETINGS-1837) Audio isn't recording but the video is ok

2018-03-07 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1837?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16390715#comment-16390715
 ] 

ASF subversion and git services commented on OPENMEETINGS-1837:
---

Commit 15822a7549bc8b644bd1bb751fde4f14479e7a55 in openmeetings's branch 
refs/heads/master from [~solomax]
[ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=15822a7 ]

[OPENMEETINGS-1837] audio-only steams are being recorded as expected


> Audio isn't recording but the video is ok
> -
>
> Key: OPENMEETINGS-1837
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1837
> Project: Openmeetings
>  Issue Type: Bug
>  Components: Audio/Video
>Affects Versions: 4.0.2
>Reporter: LUIZ AUGUSTO MACHADO DOS SANTOS
>Assignee: Maxim Solodovnik
>Priority: Major
> Fix For: 4.0.3
>
>
> Hi, the audio when we turn of the webcan stop to record. we only can record 
> the audio if the webcan is on. we are using it on Egde because we do not have 
> SSL yet. Our codecs are ok. 
> ffmpeg
> ffmpeg version 3.1.1 Copyright (c) 2000-2016 the FFmpeg developers
>  built with gcc 4.4.7 (GCC) 20120313 (Red Hat 4.4.7-18)
>  configuration: --prefix=/home/emmakes/ffmpeg_build 
> --extra-cflags=-I/home/emmakes/ffmpeg_build/include 
> --extra-ldflags=-L/home/emmakes/ffmpeg_build/lib --bindir=/home/emmakes/bin 
> --pkg-config-flags=--static --enable-gpl --enable-nonfree --enable-libfdk_aac 
> --enable-libfreetype --enable-libmp3lame --enable-libopus --enable-libvorbis 
> --enable-libvpx --enable-libx264 --enable-libx265 --enable-libtheora
>  libavutil 55. 28.100 / 55. 28.100
>  libavcodec 57. 48.101 / 57. 48.101
>  libavformat 57. 41.100 / 57. 41.100
>  libavdevice 57. 0.101 / 57. 0.101
>  libavfilter 6. 47.100 / 6. 47.100
>  libswscale 4. 1.100 / 4. 1.100
>  libswresample 2. 1.100 / 2. 1.100
>  libpostproc 54. 0.100 / 54. 0.100
> Hyper fast Audio and Video encoder
> usage: ffmpeg [options] [[infile options] -i infile]... \{[outfile options] 
> outfile}... 



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[openmeetings] 02/02: [OPENMEETINGS-1836] basic video send/receive is implemented

2018-03-07 Thread solomax 
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch OPENMEETINGS-1649-kurento
in repository https://gitbox.apache.org/repos/asf/openmeetings.git

commit b0d77a67ea50885145e998066bcbc1645d0bd626
Author: Maxim Solodovnik 
AuthorDate: Thu Mar 8 00:48:48 2018 +0700

[OPENMEETINGS-1836] basic video send/receive is implemented
---
 .../src/main/java/org/apache/openmeetings/core/remote/KUser.java  | 6 +++---
 .../java/org/apache/openmeetings/core/remote/KurentoHandler.java  | 2 +-
 .../org/apache/openmeetings/web/room/sidebar/RoomSidebar.java | 3 +--
 .../main/java/org/apache/openmeetings/web/room/video-manager.js   | 8 
 .../src/main/webapp/WEB-INF/classes/logback-config.xml| 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KUser.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KUser.java
index 85b4e95..e2bbb2a 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KUser.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KUser.java
@@ -90,13 +90,13 @@ public class KUser implements Closeable {
 
log.trace("USER {}: SdpOffer for {} is {}", this.uid, 
sender.getUid(), sdpOffer);
 
-   final String ipSdpAnswer = this.getEndpointForUser(h, 
sender).processOffer(sdpOffer);
+   final String sdpAnswer = this.getEndpointForUser(h, 
sender).processOffer(sdpOffer);
final JSONObject scParams = newKurentoMsg();
scParams.put("id", "videoResponse");
scParams.put("uid", sender.getUid());
-   scParams.put("sdpAnswer", ipSdpAnswer);
+   scParams.put("sdpAnswer", sdpAnswer);
 
-   log.trace("USER {}: SdpAnswer for {} is {}", this.uid, 
sender.getUid(), ipSdpAnswer);
+   log.trace("USER {}: SdpAnswer for {} is {}", this.uid, 
sender.getUid(), sdpAnswer);
h.sendClient(uid, scParams);
log.debug("gather candidates");
this.getEndpointForUser(h, sender).gatherCandidates();
diff --git 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
index 607238f..c403209 100644
--- 
a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
+++ 
b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KurentoHandler.java
@@ -76,7 +76,7 @@ public class KurentoHandler {
}
IceCandidate cand = new 
IceCandidate(candidate.getString("candidate"),
candidate.getString("sdpMid"), 
candidate.getInt("sdpMLineIndex"));
-   user.addCandidate(cand, msg.getString("name"));
+   user.addCandidate(cand, msg.getString("uid"));
break;
default:
break;
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index 3a1b38e..843e4ea 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@ -18,7 +18,6 @@
  */
 package org.apache.openmeetings.web.room.sidebar;
 
-import static org.apache.openmeetings.web.app.Application.getBean;
 import static org.apache.openmeetings.web.app.Application.kickUser;
 import static 
org.apache.openmeetings.web.room.RoomBroadcaster.sendUpdatedClient;
 import static 
org.apache.openmeetings.web.util.CallbackFunctionHelper.getNamedFunction;
@@ -283,7 +282,7 @@ public class RoomSidebar extends Panel {
}
 
private ListView updateUsers() {
-   
users.setList(getBean(ClientManager.class).listByRoom(room.getRoom().getId()));
+   users.setList(cm.listByRoom(room.getRoom().getId()));
return users;
}
 
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-manager.js
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-manager.js
index fd05ab1..35b616c 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-manager.js
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-manager.js
@@ -37,13 +37,13 @@ var VideoManager = (function() {
}
}*/
}
-   , onicecandidate:

[openmeetings] branch OPENMEETINGS-1649-kurento updated (82951c0 -> b0d77a6)

2018-03-07 Thread solomax 
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a change to branch OPENMEETINGS-1649-kurento
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.


from 82951c0  [OPENMEETINGS-1836] more NPEs are fixed
 new 52f2fa3  [OPENMEETINGS-1836] condition is fixed
 new b0d77a6  [OPENMEETINGS-1836] basic video send/receive is implemented

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/main/java/org/apache/openmeetings/core/remote/KUser.java  | 6 +++---
 .../java/org/apache/openmeetings/core/remote/KurentoHandler.java  | 2 +-
 .../org/apache/openmeetings/web/room/sidebar/RoomSidebar.java | 5 ++---
 .../main/java/org/apache/openmeetings/web/room/video-manager.js   | 8 
 .../src/main/webapp/WEB-INF/classes/logback-config.xml| 2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
solo...@apache.org.

[openmeetings] 01/02: [OPENMEETINGS-1836] condition is fixed

2018-03-07 Thread solomax 
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch OPENMEETINGS-1649-kurento
in repository https://gitbox.apache.org/repos/asf/openmeetings.git

commit 52f2fa3da9b56932321c6986238390b75e138da2
Author: Maxim Solodovnik 
AuthorDate: Wed Mar 7 22:10:42 2018 +0700

[OPENMEETINGS-1836] condition is fixed
---
 .../main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index 721cc23..3a1b38e 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@ -296,7 +296,7 @@ public class RoomSidebar extends Panel {
}
 
public void update(IPartialPageRequestHandler handler) {
-   if (room.getRoom() == null || room.getClient() != null) {
+   if (room.getRoom() == null || room.getClient() == null) {
return;
}
updateShowFiles(handler);

-- 
To stop receiving notification emails like this one, please contact
solo...@apache.org.

[jira] [Commented] (OPENMEETINGS-1836) Performance degradation

2018-03-07 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1836?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16389877#comment-16389877
 ] 

ASF subversion and git services commented on OPENMEETINGS-1836:
---

Commit b0d77a67ea50885145e998066bcbc1645d0bd626 in openmeetings's branch 
refs/heads/OPENMEETINGS-1649-kurento from [~solomax]
[ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=b0d77a6 ]

[OPENMEETINGS-1836] basic video send/receive is implemented


> Performance degradation
> ---
>
> Key: OPENMEETINGS-1836
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1836
> Project: Openmeetings
>  Issue Type: Bug
>  Components: HTML5/Room
>Affects Versions: 4.0.2
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
>Priority: Blocker
> Fix For: 4.0.3
>
>
> Performance degradation observed during 10+ users perform simultaneous 
> actions in the room



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[jira] [Commented] (OPENMEETINGS-1836) Performance degradation

2018-03-07 Thread ASF subversion and git services (JIRA) 

[ 
https://issues.apache.org/jira/browse/OPENMEETINGS-1836?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16389876#comment-16389876
 ] 

ASF subversion and git services commented on OPENMEETINGS-1836:
---

Commit 52f2fa3da9b56932321c6986238390b75e138da2 in openmeetings's branch 
refs/heads/OPENMEETINGS-1649-kurento from [~solomax]
[ https://gitbox.apache.org/repos/asf?p=openmeetings.git;h=52f2fa3 ]

[OPENMEETINGS-1836] condition is fixed


> Performance degradation
> ---
>
> Key: OPENMEETINGS-1836
> URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1836
> Project: Openmeetings
>  Issue Type: Bug
>  Components: HTML5/Room
>Affects Versions: 4.0.2
>Reporter: Maxim Solodovnik
>Assignee: Maxim Solodovnik
>Priority: Blocker
> Fix For: 4.0.3
>
>
> Performance degradation observed during 10+ users perform simultaneous 
> actions in the room



--
This message was sent by Atlassian JIRA
(v7.6.3#76005)

[openmeetings] branch master updated: [OPENMEETINGS-1836] some NPEs are fixed

2018-03-07 Thread solomax 
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
 new 5aa47cb  [OPENMEETINGS-1836] some NPEs are fixed
5aa47cb is described below

commit 5aa47cbd28c0a5bf03bc0b209c45bdc50f3b125a
Author: Maxim Solodovnik 
AuthorDate: Wed Mar 7 16:04:21 2018 +0700

[OPENMEETINGS-1836] some NPEs are fixed
---
 .../java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html | 1 +
 .../java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java  | 4 +++-
 .../org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java| 2 +-
 .../org/apache/openmeetings/web/room/sidebar/icon/UserSpeaksIcon.java | 4 +++-
 .../openmeetings/web/room/sidebar/icon/right/ModeratorRightIcon.java  | 2 +-
 .../openmeetings/web/room/sidebar/icon/right/PresenterRightIcon.java  | 2 +-
 .../openmeetings/web/room/sidebar/icon/right/WhiteboardRightIcon.java | 4 ++--
 openmeetings-web/src/main/webapp/css/room.css | 1 -
 8 files changed, 12 insertions(+), 8 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html
index ad8f2d5..d050375 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html
@@ -30,5 +30,6 @@



+   
 
 
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java
index 7e4069d..55c7a86 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java
@@ -20,6 +20,7 @@ package org.apache.openmeetings.web.room.sidebar.icon;
 
 import static org.apache.openmeetings.web.room.sidebar.RoomSidebar.FUNC_ACTION;
 
+import org.apache.openmeetings.db.entity.basic.Client;
 import org.apache.openmeetings.db.entity.room.Room.Right;
 import org.apache.openmeetings.web.room.RoomPanel.Action;
 
@@ -43,7 +44,8 @@ public class KickIcon extends ClientIcon {
 
@Override
protected String getScript() {
-   return String.format("%s('%s', '%s');", FUNC_ACTION, 
Action.kick.name(), getClient().getUid());
+   Client c = getClient();
+   return c == null ? "" : String.format("%s('%s', '%s');", 
FUNC_ACTION, Action.kick.name(), c.getUid());
}
 
@Override
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
index 13a4b06..66de901 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
@@ -46,7 +46,7 @@ public class RefreshIcon extends ClientIcon {
@Override
protected boolean isClickable() {
final Client c = getClient();
-   return c.hasActivity(Activity.broadcastA) || 
c.hasActivity(Activity.broadcastV);
+   return c != null && (c.hasActivity(Activity.broadcastA) || 
c.hasActivity(Activity.broadcastV));
}
 
@Override
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/UserSpeaksIcon.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/UserSpeaksIcon.java
index 52cdd92..e186c2a 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/UserSpeaksIcon.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/UserSpeaksIcon.java
@@ -18,6 +18,7 @@
  */
 package org.apache.openmeetings.web.room.sidebar.icon;
 
+import org.apache.openmeetings.db.entity.basic.Client;
 import org.apache.openmeetings.db.entity.basic.Client.Activity;
 import org.apache.openmeetings.db.entity.room.Room;
 
@@ -30,7 +31,8 @@ public class UserSpeaksIcon extends ClientIcon {
}
 
private boolean isActive() {
-   return getClient().hasActivity(Activity.broadcastA) && 
roomHasRight(Room.Right.exclusive);
+   Client c = getClient();
+   return c != null && (c.hasActivity(Activity.broadcastA) && 
roomHasRight(Room.Right.exclusive));
}
 
@Override
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ModeratorRightIcon.java

[openmeetings] branch OPENMEETINGS-1649-kurento updated: [OPENMEETINGS-1836] some NPEs are fixed

2018-03-07 Thread solomax 
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch OPENMEETINGS-1649-kurento
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/OPENMEETINGS-1649-kurento by 
this push:
 new 21dc9b9  [OPENMEETINGS-1836] some NPEs are fixed
21dc9b9 is described below

commit 21dc9b9560e956457cbc88baf61d887b503ff6ec
Author: Maxim Solodovnik 
AuthorDate: Wed Mar 7 16:04:21 2018 +0700

[OPENMEETINGS-1836] some NPEs are fixed
---
 .../java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html | 1 +
 .../java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java  | 4 +++-
 .../org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java| 2 +-
 .../org/apache/openmeetings/web/room/sidebar/icon/UserSpeaksIcon.java | 4 +++-
 .../openmeetings/web/room/sidebar/icon/right/ModeratorRightIcon.java  | 2 +-
 .../openmeetings/web/room/sidebar/icon/right/PresenterRightIcon.java  | 2 +-
 .../openmeetings/web/room/sidebar/icon/right/WhiteboardRightIcon.java | 4 ++--
 openmeetings-web/src/main/webapp/css/room.css | 1 -
 8 files changed, 12 insertions(+), 8 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html
index ad8f2d5..d050375 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html
@@ -30,5 +30,6 @@



+   
 
 
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java
index 7e4069d..55c7a86 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java
@@ -20,6 +20,7 @@ package org.apache.openmeetings.web.room.sidebar.icon;
 
 import static org.apache.openmeetings.web.room.sidebar.RoomSidebar.FUNC_ACTION;
 
+import org.apache.openmeetings.db.entity.basic.Client;
 import org.apache.openmeetings.db.entity.room.Room.Right;
 import org.apache.openmeetings.web.room.RoomPanel.Action;
 
@@ -43,7 +44,8 @@ public class KickIcon extends ClientIcon {
 
@Override
protected String getScript() {
-   return String.format("%s('%s', '%s');", FUNC_ACTION, 
Action.kick.name(), getClient().getUid());
+   Client c = getClient();
+   return c == null ? "" : String.format("%s('%s', '%s');", 
FUNC_ACTION, Action.kick.name(), c.getUid());
}
 
@Override
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
index 13a4b06..66de901 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
@@ -46,7 +46,7 @@ public class RefreshIcon extends ClientIcon {
@Override
protected boolean isClickable() {
final Client c = getClient();
-   return c.hasActivity(Activity.broadcastA) || 
c.hasActivity(Activity.broadcastV);
+   return c != null && (c.hasActivity(Activity.broadcastA) || 
c.hasActivity(Activity.broadcastV));
}
 
@Override
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/UserSpeaksIcon.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/UserSpeaksIcon.java
index 52cdd92..e186c2a 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/UserSpeaksIcon.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/UserSpeaksIcon.java
@@ -18,6 +18,7 @@
  */
 package org.apache.openmeetings.web.room.sidebar.icon;
 
+import org.apache.openmeetings.db.entity.basic.Client;
 import org.apache.openmeetings.db.entity.basic.Client.Activity;
 import org.apache.openmeetings.db.entity.room.Room;
 
@@ -30,7 +31,8 @@ public class UserSpeaksIcon extends ClientIcon {
}
 
private boolean isActive() {
-   return getClient().hasActivity(Activity.broadcastA) && 
roomHasRight(Room.Right.exclusive);
+   Client c = getClient();
+   return c != null && (c.hasActivity(Activity.broadcastA) && 
roomHasRight(Room.Right.exclusive));
}
 
@Override
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ModeratorRightIcon.java

[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1836] some NPEs are fixed

2018-03-07 Thread solomax 
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/4.0.x by this push:
 new 3b39899  [OPENMEETINGS-1836] some NPEs are fixed
3b39899 is described below

commit 3b398996ee6595f8ee6d00a9ac6e0c4777f5200f
Author: Maxim Solodovnik 
AuthorDate: Wed Mar 7 16:04:21 2018 +0700

[OPENMEETINGS-1836] some NPEs are fixed
---
 .../java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html | 1 +
 .../java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java  | 4 +++-
 .../org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java| 2 +-
 .../org/apache/openmeetings/web/room/sidebar/icon/UserSpeaksIcon.java | 4 +++-
 .../openmeetings/web/room/sidebar/icon/right/ModeratorRightIcon.java  | 2 +-
 .../openmeetings/web/room/sidebar/icon/right/PresenterRightIcon.java  | 2 +-
 .../openmeetings/web/room/sidebar/icon/right/WhiteboardRightIcon.java | 4 ++--
 openmeetings-web/src/main/webapp/css/room.css | 1 -
 8 files changed, 12 insertions(+), 8 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html
index ad8f2d5..d050375 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/SelfIconsPanel.html
@@ -30,5 +30,6 @@



+   
 
 
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java
index 7e4069d..55c7a86 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/KickIcon.java
@@ -20,6 +20,7 @@ package org.apache.openmeetings.web.room.sidebar.icon;
 
 import static org.apache.openmeetings.web.room.sidebar.RoomSidebar.FUNC_ACTION;
 
+import org.apache.openmeetings.db.entity.basic.Client;
 import org.apache.openmeetings.db.entity.room.Room.Right;
 import org.apache.openmeetings.web.room.RoomPanel.Action;
 
@@ -43,7 +44,8 @@ public class KickIcon extends ClientIcon {
 
@Override
protected String getScript() {
-   return String.format("%s('%s', '%s');", FUNC_ACTION, 
Action.kick.name(), getClient().getUid());
+   Client c = getClient();
+   return c == null ? "" : String.format("%s('%s', '%s');", 
FUNC_ACTION, Action.kick.name(), c.getUid());
}
 
@Override
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
index 13a4b06..66de901 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/RefreshIcon.java
@@ -46,7 +46,7 @@ public class RefreshIcon extends ClientIcon {
@Override
protected boolean isClickable() {
final Client c = getClient();
-   return c.hasActivity(Activity.broadcastA) || 
c.hasActivity(Activity.broadcastV);
+   return c != null && (c.hasActivity(Activity.broadcastA) || 
c.hasActivity(Activity.broadcastV));
}
 
@Override
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/UserSpeaksIcon.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/UserSpeaksIcon.java
index 52cdd92..e186c2a 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/UserSpeaksIcon.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/UserSpeaksIcon.java
@@ -18,6 +18,7 @@
  */
 package org.apache.openmeetings.web.room.sidebar.icon;
 
+import org.apache.openmeetings.db.entity.basic.Client;
 import org.apache.openmeetings.db.entity.basic.Client.Activity;
 import org.apache.openmeetings.db.entity.room.Room;
 
@@ -30,7 +31,8 @@ public class UserSpeaksIcon extends ClientIcon {
}
 
private boolean isActive() {
-   return getClient().hasActivity(Activity.broadcastA) && 
roomHasRight(Room.Right.exclusive);
+   Client c = getClient();
+   return c != null && (c.hasActivity(Activity.broadcastA) && 
roomHasRight(Room.Right.exclusive));
}
 
@Override
diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/icon/right/ModeratorRightIcon.java

[openmeetings] branch master updated: [OPENMEETINGS-1836] more NPEs are fixed

2018-03-07 Thread solomax 
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
 new b200a54  [OPENMEETINGS-1836] more NPEs are fixed
b200a54 is described below

commit b200a54fcb1eae62cd7be89e11b32593878c7ade
Author: Maxim Solodovnik 
AuthorDate: Wed Mar 7 21:31:08 2018 +0700

[OPENMEETINGS-1836] more NPEs are fixed
---
 .../java/org/apache/openmeetings/web/room/RoomPanel.java | 16 +++-
 .../openmeetings/web/room/sidebar/RoomSidebar.java   |  2 +-
 .../org/apache/openmeetings/web/room/wb/WbPanel.java |  3 +++
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index 1ce716a..23ac29c 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -393,7 +393,8 @@ public class RoomPanel extends BasePanel {
 
@Override
public void onEvent(IEvent event) {
-   if (event.getPayload() instanceof WebSocketPushPayload) {
+   Client _c = getClient();
+   if (_c != null && event.getPayload() instanceof 
WebSocketPushPayload) {
WebSocketPushPayload wsEvent = (WebSocketPushPayload) 
event.getPayload();
if (wsEvent.getMessage() instanceof RoomMessage) {
RoomMessage m = 
(RoomMessage)wsEvent.getMessage();
@@ -471,7 +472,6 @@ public class RoomPanel extends BasePanel {
log.error("Not 
existing user in rightUpdated {} ", uid);
return;
}
-   Client _c = getClient();
boolean self = 
_c.getUid().equals(c.getUid());

handler.appendJavaScript(String.format("VideoManager.update(%s);"
, 
c.streamJson(_c.getSid(), self, 
getBean(StreamClientManager.class)).toString(new NullStringer())
@@ -495,7 +495,6 @@ public class RoomPanel extends BasePanel {
log.error("Not existing 
user in newStream {} ", uid);
return;
}
-   Client _c = getClient();
boolean self = 
_c.getSid().equals(c.getSid());
StreamClientManager mgr = 
getBean(StreamClientManager.class);
if (!self || Client.Type.room 
!= mgr.get(uid).getType()) { // stream from others or self external video
@@ -515,7 +514,6 @@ public class RoomPanel extends BasePanel {
Client c = 
cm.getBySid(obj.getString("sid"));
if (c != null) {
//c == null means 
client exits the room
-   Client _c = getClient();
if 
(_c.getUid().equals(c.getUid())) {

cm.update(c.removeStream(uid));
}
@@ -568,18 +566,18 @@ public class RoomPanel extends BasePanel {

sidebar.removeActivity(((TextRoomMessage)m).getText(), handler);
break;
case haveQuestion:
-   if 
(getClient().hasRight(Room.Right.moderator) || 
getUserId().equals(m.getUserId())) {
+   if 
(_c.hasRight(Room.Right.moderator) || getUserId().equals(m.getUserId())) {
sidebar.addActivity(new 
Activity((TextRoomMessage)m, Activity.Type.haveQuestion), handler);
}
break;
case kick:
{
String uid = 
((TextRoomMessage)m).getText();
-

[openmeetings] branch OPENMEETINGS-1649-kurento updated: [OPENMEETINGS-1836] more NPEs are fixed

2018-03-07 Thread solomax 
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch OPENMEETINGS-1649-kurento
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/OPENMEETINGS-1649-kurento by 
this push:
 new 82951c0  [OPENMEETINGS-1836] more NPEs are fixed
82951c0 is described below

commit 82951c0ab8237254c88e61e844b0ae7c4f6d8e49
Author: Maxim Solodovnik 
AuthorDate: Wed Mar 7 21:31:08 2018 +0700

[OPENMEETINGS-1836] more NPEs are fixed
---
 .../java/org/apache/openmeetings/web/room/RoomPanel.java | 16 +++-
 .../openmeetings/web/room/sidebar/RoomSidebar.java   |  2 +-
 .../org/apache/openmeetings/web/room/wb/WbPanel.java |  3 +++
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index 6614368..28e144d 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -395,7 +395,8 @@ public class RoomPanel extends BasePanel {
 
@Override
public void onEvent(IEvent event) {
-   if (event.getPayload() instanceof WebSocketPushPayload) {
+   Client _c = getClient();
+   if (_c != null && event.getPayload() instanceof 
WebSocketPushPayload) {
WebSocketPushPayload wsEvent = (WebSocketPushPayload) 
event.getPayload();
if (wsEvent.getMessage() instanceof RoomMessage) {
RoomMessage m = 
(RoomMessage)wsEvent.getMessage();
@@ -472,7 +473,6 @@ public class RoomPanel extends BasePanel {
log.error("Not 
existing user in rightUpdated {} ", uid);
return;
}
-   Client _c = getClient();
boolean self = 
_c.getUid().equals(c.getUid());

handler.appendJavaScript(String.format("VideoManager.update(%s);"
, 
c.streamJson(_c.getSid(), self, 
getBean(StreamClientManager.class)).toString(new NullStringer())
@@ -496,7 +496,6 @@ public class RoomPanel extends BasePanel {
log.error("Not existing 
user in newStream {} ", uid);
return;
}
-   Client _c = getClient();
boolean self = 
_c.getSid().equals(c.getSid());
StreamClientManager mgr = 
getBean(StreamClientManager.class);
if (!self || Client.Type.room 
!= mgr.get(uid).getType()) { // stream from others or self external video
@@ -516,7 +515,6 @@ public class RoomPanel extends BasePanel {
Client c = 
cm.getBySid(obj.getString("sid"));
if (c != null) {
//c == null means 
client exits the room
-   Client _c = getClient();
if 
(_c.getUid().equals(c.getUid())) {

cm.update(c.removeStream(uid));
}
@@ -569,18 +567,18 @@ public class RoomPanel extends BasePanel {

sidebar.removeActivity(((TextRoomMessage)m).getText(), handler);
break;
case haveQuestion:
-   if 
(getClient().hasRight(Room.Right.moderator) || 
getUserId().equals(m.getUserId())) {
+   if 
(_c.hasRight(Room.Right.moderator) || getUserId().equals(m.getUserId())) {
sidebar.addActivity(new 
Activity((TextRoomMessage)m, Activity.Type.haveQuestion), handler);
}
break;
case kick:
{
String uid = 
((TextRoomMessage)m).getText();
-

[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1836] more NPEs are fixed

2018-03-07 Thread solomax 
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/4.0.x by this push:
 new 08ba288  [OPENMEETINGS-1836] more NPEs are fixed
08ba288 is described below

commit 08ba2884cfe0561bc9d476dfaa8e6c8b80fc1169
Author: Maxim Solodovnik 
AuthorDate: Wed Mar 7 21:31:08 2018 +0700

[OPENMEETINGS-1836] more NPEs are fixed
---
 .../java/org/apache/openmeetings/web/room/RoomPanel.java | 16 +++-
 .../openmeetings/web/room/sidebar/RoomSidebar.java   |  2 +-
 .../org/apache/openmeetings/web/room/wb/WbPanel.java |  3 +++
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
index 1ce716a..23ac29c 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RoomPanel.java
@@ -393,7 +393,8 @@ public class RoomPanel extends BasePanel {
 
@Override
public void onEvent(IEvent event) {
-   if (event.getPayload() instanceof WebSocketPushPayload) {
+   Client _c = getClient();
+   if (_c != null && event.getPayload() instanceof 
WebSocketPushPayload) {
WebSocketPushPayload wsEvent = (WebSocketPushPayload) 
event.getPayload();
if (wsEvent.getMessage() instanceof RoomMessage) {
RoomMessage m = 
(RoomMessage)wsEvent.getMessage();
@@ -471,7 +472,6 @@ public class RoomPanel extends BasePanel {
log.error("Not 
existing user in rightUpdated {} ", uid);
return;
}
-   Client _c = getClient();
boolean self = 
_c.getUid().equals(c.getUid());

handler.appendJavaScript(String.format("VideoManager.update(%s);"
, 
c.streamJson(_c.getSid(), self, 
getBean(StreamClientManager.class)).toString(new NullStringer())
@@ -495,7 +495,6 @@ public class RoomPanel extends BasePanel {
log.error("Not existing 
user in newStream {} ", uid);
return;
}
-   Client _c = getClient();
boolean self = 
_c.getSid().equals(c.getSid());
StreamClientManager mgr = 
getBean(StreamClientManager.class);
if (!self || Client.Type.room 
!= mgr.get(uid).getType()) { // stream from others or self external video
@@ -515,7 +514,6 @@ public class RoomPanel extends BasePanel {
Client c = 
cm.getBySid(obj.getString("sid"));
if (c != null) {
//c == null means 
client exits the room
-   Client _c = getClient();
if 
(_c.getUid().equals(c.getUid())) {

cm.update(c.removeStream(uid));
}
@@ -568,18 +566,18 @@ public class RoomPanel extends BasePanel {

sidebar.removeActivity(((TextRoomMessage)m).getText(), handler);
break;
case haveQuestion:
-   if 
(getClient().hasRight(Room.Right.moderator) || 
getUserId().equals(m.getUserId())) {
+   if 
(_c.hasRight(Room.Right.moderator) || getUserId().equals(m.getUserId())) {
sidebar.addActivity(new 
Activity((TextRoomMessage)m, Activity.Type.haveQuestion), handler);
}
break;
case kick:
{
String uid = 
((TextRoomMessage)m).getText();
-

[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1836] condition is fixed

2018-03-07 Thread solomax 
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/4.0.x by this push:
 new 369557b  [OPENMEETINGS-1836] condition is fixed
369557b is described below

commit 369557b3575bbf7296aa2102695bb010d03fe58a
Author: Maxim Solodovnik 
AuthorDate: Wed Mar 7 22:10:42 2018 +0700

[OPENMEETINGS-1836] condition is fixed
---
 .../main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index 4f0500e..32e90a7 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@ -294,7 +294,7 @@ public class RoomSidebar extends Panel {
}
 
public void update(IPartialPageRequestHandler handler) {
-   if (room.getRoom() == null || room.getClient() != null) {
+   if (room.getRoom() == null || room.getClient() == null) {
return;
}
updateShowFiles(handler);

-- 
To stop receiving notification emails like this one, please contact
solo...@apache.org.

[openmeetings] branch master updated: [OPENMEETINGS-1836] condition is fixed

2018-03-07 Thread solomax 
This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
 new 0024edf  [OPENMEETINGS-1836] condition is fixed
0024edf is described below

commit 0024edf13f396b48908b64af5fd0e4174ecc0b78
Author: Maxim Solodovnik 
AuthorDate: Wed Mar 7 22:10:42 2018 +0700

[OPENMEETINGS-1836] condition is fixed
---
 .../main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index 4f0500e..32e90a7 100644
--- 
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++ 
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@ -294,7 +294,7 @@ public class RoomSidebar extends Panel {
}
 
public void update(IPartialPageRequestHandler handler) {
-   if (room.getRoom() == null || room.getClient() != null) {
+   if (room.getRoom() == null || room.getClient() == null) {
return;
}
updateShowFiles(handler);

-- 
To stop receiving notification emails like this one, please contact
solo...@apache.org.