Author: solomax Date: Sat May 16 06:05:47 2015 New Revision: 1679688 URL: http://svn.apache.org/r1679688 Log: [OPENMEETINGS-1203] screen sharing/recording works as expected
Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java?rev=1679688&r1=1679687&r2=1679688&view=diff ============================================================================== --- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java (original) +++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/FLVRecorderService.java Sat May 16 06:05:47 2015 @@ -40,6 +40,7 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData; import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData.Status; import org.apache.openmeetings.db.entity.room.Client; +import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.remote.red5.ScopeApplicationAdapter; import org.apache.openmeetings.util.CalendarPatterns; import org.red5.logging.Red5LoggerFactory; @@ -110,7 +111,14 @@ public class FLVRecorderService implemen flvRecording.setFileHash(""); flvRecording.setFileName(roomRecordingName); - flvRecording.setInsertedBy(client.getUser_id()); + Long ownerId = client.getUser_id(); + if (ownerId != null && ownerId < 0) { + User c = userDao.get(-ownerId); + if (c != null) { + ownerId = c.getOwnerId(); + } + } + flvRecording.setInsertedBy(ownerId); flvRecording.setFolder(false); flvRecording.setIsImage(false); flvRecording.setIsPresentation(false); @@ -124,12 +132,12 @@ public class FLVRecorderService implemen flvRecording.setWidth(client.getVWidth()); flvRecording.setHeight(client.getVHeight()); - flvRecording.setOwnerId(client.getUser_id()); + flvRecording.setOwnerId(ownerId); flvRecording.setStatus(FlvRecording.Status.RECORDING); flvRecording = recordingDao.update(flvRecording); // Receive flvRecordingId Long flvRecordingId = flvRecording.getFlvRecordingId(); - log.debug("##REC:: recording created by USER: " + client.getUser_id()); + log.debug("##REC:: recording created by USER: " + ownerId); // Update Client and set Flag client.setIsRecording(true); Modified: openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java?rev=1679688&r1=1679687&r2=1679688&view=diff ============================================================================== --- openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java (original) +++ openmeetings/branches/3.0.x/src/main/java/org/apache/openmeetings/remote/red5/ScopeApplicationAdapter.java Sat May 16 06:05:47 2015 @@ -193,7 +193,7 @@ public class ScopeApplicationAdapter ext SessionVariablesUtil.setUserId(conn.getClient(), rcm.getUser_id()); rcm.setStreamPublishName(parentSid); - User u = usersDao.get(rcm.getUser_id()); + User u = usersDao.get(rcm.getUser_id() < 0 ? -rcm.getUser_id() : rcm.getUser_id()); rcm.setUsername(u.getLogin()); rcm.setFirstname(u.getFirstname()); rcm.setLastname(u.getLastname()); Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java?rev=1679688&r1=1679687&r2=1679688&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/FLVRecorderService.java Sat May 16 06:05:47 2015 @@ -42,6 +42,7 @@ import org.apache.openmeetings.db.entity import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData; import org.apache.openmeetings.db.entity.record.FlvRecordingMetaData.Status; import org.apache.openmeetings.db.entity.room.Client; +import org.apache.openmeetings.db.entity.user.User; import org.apache.openmeetings.util.CalendarPatterns; import org.red5.logging.Red5LoggerFactory; import org.red5.server.api.IConnection; @@ -111,7 +112,14 @@ public class FLVRecorderService implemen flvRecording.setFileHash(""); flvRecording.setFileName(roomRecordingName); - flvRecording.setInsertedBy(client.getUser_id()); + Long ownerId = client.getUser_id(); + if (ownerId != null && ownerId < 0) { + User c = userDao.get(-ownerId); + if (c != null) { + ownerId = c.getOwnerId(); + } + } + flvRecording.setInsertedBy(ownerId); flvRecording.setType(Type.Recording); flvRecording.setComment(comment); flvRecording.setIsInterview(isInterview); @@ -122,12 +130,12 @@ public class FLVRecorderService implemen flvRecording.setWidth(client.getVWidth()); flvRecording.setHeight(client.getVHeight()); - flvRecording.setOwnerId(client.getUser_id()); + flvRecording.setOwnerId(ownerId); flvRecording.setStatus(FlvRecording.Status.RECORDING); flvRecording = recordingDao.update(flvRecording); // Receive flvRecordingId Long flvRecordingId = flvRecording.getId(); - log.debug("##REC:: recording created by USER: " + client.getUser_id()); + log.debug("##REC:: recording created by USER: " + ownerId); // Update Client and set Flag client.setIsRecording(true); Modified: openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1679688&r1=1679687&r2=1679688&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original) +++ openmeetings/trunk/singlewebapp/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Sat May 16 06:05:47 2015 @@ -184,7 +184,7 @@ public class ScopeApplicationAdapter ext SessionVariablesUtil.setUserId(conn.getClient(), rcm.getUser_id()); rcm.setStreamPublishName(parentSid); - User u = usersDao.get(rcm.getUser_id()); + User u = usersDao.get(rcm.getUser_id() < 0 ? -rcm.getUser_id() : rcm.getUser_id()); rcm.setUsername(u.getLogin()); rcm.setFirstname(u.getFirstname()); rcm.setLastname(u.getLastname());