Author: sebawagner
Date: Fri Feb 24 19:01:45 2012
New Revision: 1293381
URL: http://svn.apache.org/viewvc?rev=1293381&view=rev
Log:
OPENMEETINGS-61 Fix Null Pointer Exceptions in Recording with new isAvClient
Flag
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/FLVRecorderService.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/FLVRecorderService.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/FLVRecorderService.java?rev=1293381&r1=1293380&r2=1293381&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/FLVRecorderService.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/remote/FLVRecorderService.java
Fri Feb 24 19:01:45 2012
@@ -183,14 +183,9 @@ public class FLVRecorderService implemen
.getClientByStreamId(conn.getClient()
.getId());
- log.debug("is this
users still alive? :" + rcl);
-
- // FIXME: Check if this
function is really in use at
- // the moment
- if
(rcl.getIsScreenClient() != null
- &&
rcl.getIsScreenClient()) {
- // continue;
- } else {
+ // Send every user a
notification that the recording did start
+ if (rcl.getIsAVClient()
!= null
+ &&
!rcl.getIsAVClient()) {
((IServiceCapableConnection) conn).invoke(
"startedRecording",
new Object[] { currentClient }, this);
@@ -237,7 +232,7 @@ public class FLVRecorderService implemen
// if the user does
publish av, a, v
// But we only record
av or a, video only is not
// interesting
- (rcl.getIsAVClient() &&
+ (rcl.getIsAVClient() !=
null && rcl.getIsAVClient() &&
(rcl.getAvsettings().equals("av")
||
rcl.getAvsettings().equals("a")
||
rcl.getAvsettings().equals("v"))) {
@@ -622,7 +617,7 @@ public class FLVRecorderService implemen
rcl.getFlvRecordingMetaDataId(), new Date());
}
- } else if (rcl.getIsAVClient() &&
+ } else if (rcl.getIsAVClient() != null &&
rcl.getIsAVClient() &&
(rcl.getAvsettings().equals("a")
|| rcl.getAvsettings().equals("v")
|| rcl.getAvsettings().equals("av"))) {
@@ -688,7 +683,7 @@ public class FLVRecorderService implemen
} else if
// if the user does publish av, a, v
// But we only record av or a, video only is not
interesting
- (rcl.getIsAVClient() &&
+ (rcl.getIsAVClient() != null && rcl.getIsAVClient() &&
(rcl.getAvsettings().equals("av")
|| rcl.getAvsettings().equals("a")
|| rcl.getAvsettings().equals("v"))) {
