Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 5B2F1200C41 for ; Fri, 24 Mar 2017 10:58:50 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 59B3D160B93; Fri, 24 Mar 2017 09:58:50 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 76C71160B82 for ; Fri, 24 Mar 2017 10:58:49 +0100 (CET) Received: (qmail 18234 invoked by uid 500); 24 Mar 2017 09:58:48 -0000 Mailing-List: contact commits-help@openmeetings.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openmeetings.apache.org Delivered-To: mailing list commits@openmeetings.apache.org Received: (qmail 18225 invoked by uid 99); 24 Mar 2017 09:58:48 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Mar 2017 09:58:48 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 089533A18C4 for ; Fri, 24 Mar 2017 09:58:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1788398 - in /openmeetings/application: branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/ branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/ trunk/openmeetings-core/src/m... Date: Fri, 24 Mar 2017 09:58:47 -0000 To: commits@openmeetings.apache.org From: solomax@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170324095848.089533A18C4@svn01-us-west.apache.org> archived-at: Fri, 24 Mar 2017 09:58:50 -0000 Author: solomax Date: Fri Mar 24 09:58:47 2017 New Revision: 1788398 URL: http://svn.apache.org/viewvc?rev=1788398&view=rev Log: no jira: couple NPEs are fixed Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java Modified: openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java?rev=1788398&r1=1788397&r2=1788398&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java Fri Mar 24 09:58:47 2017 @@ -52,6 +52,7 @@ import org.red5.server.api.scope.IScope; import org.red5.server.api.service.IPendingServiceCall; import org.red5.server.api.service.IPendingServiceCallback; import org.red5.server.api.service.IServiceCapableConnection; +import org.red5.server.api.stream.IBroadcastStream; import org.red5.server.api.stream.IStreamListener; import org.red5.server.stream.ClientBroadcastStream; import org.slf4j.Logger; @@ -250,22 +251,10 @@ public class RecordingService implements */ public void stopRecordingShow(IScope scope, String broadcastId, Long metaId) { try { - if (metaId == null) { - // this should be fixed, can be useful for debugging, after all this is an error - // but we don't want the application to completely stop the process - log.error("recordingMetaDataId is null"); - } - log.debug("** stopRecordingShow: " + scope); log.debug("### Stop recording show for broadcastId: " + broadcastId + " || " + scope.getContextPath()); - Object streamToClose = scopeApplicationAdapter.getBroadcastStream(scope, broadcastId); - - StreamListener listenerAdapter = streamListeners.get(metaId); - - log.debug("Stream Closing :: " + metaId); - - ClientBroadcastStream stream = (ClientBroadcastStream) streamToClose; + IBroadcastStream stream = scopeApplicationAdapter.getBroadcastStream(scope, broadcastId); // the stream can be null if the user just closes the browser // without canceling the recording before leaving @@ -278,6 +267,16 @@ public class RecordingService implements } } + if (metaId == null) { + // this should be fixed, can be useful for debugging, after all this is an error + // but we don't want the application to completely stop the process + log.error("recordingMetaDataId is null"); + return; + } + + StreamListener listenerAdapter = streamListeners.get(metaId); + log.debug("Stream Closing :: " + metaId); + RecordingMetaData metaData = metaDataDao.get(metaId); BaseConverter.printMetaInfo(metaData, "Stopping the stream"); // Manually call finish on the stream so that there is no endless loop waiting in the RecordingConverter waiting for the stream to finish Modified: openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java?rev=1788398&r1=1788397&r2=1788398&view=diff ============================================================================== --- openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java (original) +++ openmeetings/application/branches/3.2.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java Fri Mar 24 09:58:47 2017 @@ -41,7 +41,7 @@ import org.simpleframework.xml.Root; @Entity @NamedQueries({ - @NamedQuery(name = "forceGetConfigurationByKey", query = "SELECT c FROM Configuration c " + @NamedQuery(name = "forceGetConfigurationByKey", query = "SELECT c FROM Configuration c " + "WHERE c.key LIKE :key"), @NamedQuery(name = "getConfigurationsByKeys", query = "SELECT c FROM Configuration c " + "WHERE c.key IN :keys and c.deleted = false"), Modified: openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java?rev=1788398&r1=1788397&r2=1788398&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java (original) +++ openmeetings/application/trunk/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/RecordingService.java Fri Mar 24 09:58:47 2017 @@ -52,6 +52,7 @@ import org.red5.server.api.scope.IScope; import org.red5.server.api.service.IPendingServiceCall; import org.red5.server.api.service.IPendingServiceCallback; import org.red5.server.api.service.IServiceCapableConnection; +import org.red5.server.api.stream.IBroadcastStream; import org.red5.server.api.stream.IStreamListener; import org.red5.server.stream.ClientBroadcastStream; import org.slf4j.Logger; @@ -250,22 +251,10 @@ public class RecordingService implements */ public void stopRecordingShow(IScope scope, String broadcastId, Long metaId) { try { - if (metaId == null) { - // this should be fixed, can be useful for debugging, after all this is an error - // but we don't want the application to completely stop the process - log.error("recordingMetaDataId is null"); - } - log.debug("** stopRecordingShow: " + scope); log.debug("### Stop recording show for broadcastId: " + broadcastId + " || " + scope.getContextPath()); - Object streamToClose = scopeApplicationAdapter.getBroadcastStream(scope, broadcastId); - - StreamListener listenerAdapter = streamListeners.get(metaId); - - log.debug("Stream Closing :: " + metaId); - - ClientBroadcastStream stream = (ClientBroadcastStream) streamToClose; + IBroadcastStream stream = scopeApplicationAdapter.getBroadcastStream(scope, broadcastId); // the stream can be null if the user just closes the browser // without canceling the recording before leaving @@ -278,6 +267,16 @@ public class RecordingService implements } } + if (metaId == null) { + // this should be fixed, can be useful for debugging, after all this is an error + // but we don't want the application to completely stop the process + log.error("recordingMetaDataId is null"); + return; + } + + StreamListener listenerAdapter = streamListeners.get(metaId); + log.debug("Stream Closing :: " + metaId); + RecordingMetaData metaData = metaDataDao.get(metaId); BaseConverter.printMetaInfo(metaData, "Stopping the stream"); // Manually call finish on the stream so that there is no endless loop waiting in the RecordingConverter waiting for the stream to finish Modified: openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java?rev=1788398&r1=1788397&r2=1788398&view=diff ============================================================================== --- openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java (original) +++ openmeetings/application/trunk/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/basic/Configuration.java Fri Mar 24 09:58:47 2017 @@ -41,7 +41,7 @@ import org.simpleframework.xml.Root; @Entity @NamedQueries({ - @NamedQuery(name = "forceGetConfigurationByKey", query = "SELECT c FROM Configuration c " + @NamedQuery(name = "forceGetConfigurationByKey", query = "SELECT c FROM Configuration c " + "WHERE c.key LIKE :key"), @NamedQuery(name = "getConfigurationsByKeys", query = "SELECT c FROM Configuration c " + "WHERE c.key IN :keys and c.deleted = false"),