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 2014/01/04 05:45:34 UTC
svn commit: r1555320 - in /openmeetings/trunk/singlewebapp/src:
util/java/org/apache/openmeetings/util/OmFileHelper.java
web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
Author: solomax
Date: Sat Jan 4 04:45:33 2014
New Revision: 1555320
URL: http://svn.apache.org/r1555320
Log:
NPE in recordings is fixed
Modified:
openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OmFileHelper.java
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
Modified: openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OmFileHelper.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OmFileHelper.java?rev=1555320&r1=1555319&r2=1555320&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OmFileHelper.java (original)
+++ openmeetings/trunk/singlewebapp/src/util/java/org/apache/openmeetings/util/OmFileHelper.java Sat Jan 4 04:45:33 2014
@@ -183,6 +183,15 @@ public class OmFileHelper {
return new File(getDir(getStreamsDir(), HIBERNATE_DIR), name);
}
+ public static boolean isRecordingExists(String name) {
+ try {
+ return new File(getDir(getStreamsDir(), HIBERNATE_DIR), name).exists();
+ } catch (Exception e) {
+ //no-op
+ }
+ return false;
+ }
+
public static File getMp4Recording(String name) {
return new File(getDir(getStreamsDir(), HIBERNATE_DIR), name + MP4_EXTENSION);
}
Modified: openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java?rev=1555320&r1=1555319&r2=1555320&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java Sat Jan 4 04:45:33 2014
@@ -20,6 +20,7 @@ package org.apache.openmeetings.web.user
import static org.apache.openmeetings.util.OmFileHelper.getMp4Recording;
import static org.apache.openmeetings.util.OmFileHelper.getRecording;
+import static org.apache.openmeetings.util.OmFileHelper.isRecordingExists;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
@@ -260,8 +261,8 @@ public class RecordingsPanel extends Use
, new MediaSource("" + getRequestCycle().urlFor(oggres, pp), "video/ogg")));
}
player.setVisible(videoExists);
- target.add(video, info, dAVI.setEnabled(getRecording(r.getAlternateDownload()).exists()));
- target.add(video, info, dFLV.setEnabled(getRecording(r.getFileHash()).exists()));
+ target.add(video, info, dAVI.setEnabled(isRecordingExists(r.getAlternateDownload())));
+ target.add(video, info, dFLV.setEnabled(isRecordingExists(r.getFileHash())));
updateNode(r, target);
}
}