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 2015/01/21 07:35:51 UTC
svn commit: r1653448 - in /openmeetings:
branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
Author: solomax
Date: Wed Jan 21 06:35:51 2015
New Revision: 1653448
URL: http://svn.apache.org/r1653448
Log:
[OPENMEETINGS-547] NPE on broken recording is fixed
Modified:
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1653448&r1=1653447&r2=1653448&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/record/VideoInfo.java Wed Jan 21 06:35:51 2015
@@ -142,7 +142,7 @@ public class VideoInfo extends Panel {
reconvLabel:
if (!metas.isEmpty()) {
for (FlvRecordingMetaData meta : metas) {
- if (!getRecordingMetaData(r.getRoom_id(), meta.getStreamName()).exists()) {
+ if (r.getRoom_id() == null || !getRecordingMetaData(r.getRoom_id(), meta.getStreamName()).exists()) {
break reconvLabel;
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java?rev=1653448&r1=1653447&r2=1653448&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java Wed Jan 21 06:35:51 2015
@@ -142,7 +142,7 @@ public class VideoInfo extends Panel {
reconvLabel:
if (!metas.isEmpty()) {
for (FlvRecordingMetaData meta : metas) {
- if (!getRecordingMetaData(r.getRoomId(), meta.getStreamName()).exists()) {
+ if (r.getRoomId() == null || !getRecordingMetaData(r.getRoomId(), meta.getStreamName()).exists()) {
break reconvLabel;
}
}