You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/08/01 06:17:32 UTC
svn commit: r1509078 - in
/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings:
persistence/beans/room/Client.java
servlet/outputhandler/ScreenController.java
Author: solomax
Date: Thu Aug 1 04:17:32 2013
New Revision: 1509078
URL: http://svn.apache.org/r1509078
Log:
Debug output is enchanced
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Client.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Client.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Client.java?rev=1509078&r1=1509077&r2=1509078&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Client.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/room/Client.java Thu Aug 1 04:17:32 2013
@@ -373,7 +373,7 @@ public class Client implements IDataProv
* @see Client#getAllowRecording()
*/
@Column(name = "allow_recording")
- private Boolean allowRecording = true;
+ private boolean allowRecording = true;
/**
* @see Client#getZombieCheckFlag()
@@ -830,11 +830,11 @@ public class Client implements IDataProv
this.canGiveAudio = canGiveAudio;
}
- public Boolean getAllowRecording() {
+ public boolean getAllowRecording() {
return allowRecording;
}
- public void setAllowRecording(Boolean allowRecording) {
+ public void setAllowRecording(boolean allowRecording) {
this.allowRecording = allowRecording;
}
@@ -876,6 +876,7 @@ public class Client implements IDataProv
+ " StreamId: " + this.getStreamid() //
+ " PublicSID: " + this.getPublicSID() //
+ " UserId: " + this.getUser_id() //
+ + " RoomId: " + this.room_id //
+ " isScreenClient: " + this.getIsScreenClient() //
+ " flvRecordingId: " + this.getFlvRecordingId() //
+ " screenPublishStarted: " + this.isScreenPublishStarted() //
Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java?rev=1509078&r1=1509077&r2=1509078&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/servlet/outputhandler/ScreenController.java Thu Aug 1 04:17:32 2013
@@ -175,13 +175,14 @@ public class ScreenController {
}
Client rc = sessionManager.getClientByPublicSID(publicSID, false, null);
if (rc == null) {
- throw new Exception("port is empty: ");
+ throw new Exception("Port is empty");
}
Long roomId = rc.getRoom_id();
- boolean allowRecording = rc.getAllowRecording()
- && (0 == sessionManager.getRecordingCount(roomId));
- boolean allowPublishing = (0 == sessionManager
- .getPublishingCount(roomId));
+ if (roomId == null) {
+ throw new Exception("Client has no room");
+ }
+ boolean allowRecording = rc.getAllowRecording() && (0 == sessionManager.getRecordingCount(roomId));
+ boolean allowPublishing = (0 == sessionManager.getPublishingCount(roomId));
Context ctx = new VelocityContext();
ctx.put("APP_NAME", configurationDao.getAppName());