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 2016/05/11 17:58:05 UTC
svn commit: r1743404 -
/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Author: solomax
Date: Wed May 11 17:58:05 2016
New Revision: 1743404
URL: http://svn.apache.org/viewvc?rev=1743404&view=rev
Log:
[OPENMEETINGS-1384] 3.1.x build is fixed
Modified:
openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
Modified: openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java
URL: http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java?rev=1743404&r1=1743403&r2=1743404&view=diff
==============================================================================
--- openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java (original)
+++ openmeetings/application/branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/red5/ScopeApplicationAdapter.java Wed May 11 17:58:05 2016
@@ -20,7 +20,6 @@ package org.apache.openmeetings.core.rem
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
@@ -2168,8 +2167,8 @@ public class ScopeApplicationAdapter ext
String streamid = current.getClient().getId();
Client currentClient = sessionManager.getClientByStreamId(streamid, null);
try {
- sipDao.joinToConfCall(number, roomDao.get(currentClient.getRoomId()))
- } catch (IOException e) {
+ sipDao.joinToConfCall(number, roomDao.get(currentClient.getRoomId()));
+ } catch (Exception e) {
log.error("Executing asterisk originate error: ", e);
}
}