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 2020/12/26 13:26:29 UTC

[openmeetings] branch master updated: [OPENMEETINGS-2520] couple sonar issues are addressed

This is an automated email from the ASF dual-hosted git repository.

solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git


The following commit(s) were added to refs/heads/master by this push:
     new bba73d4  [OPENMEETINGS-2520] couple sonar issues are addressed
bba73d4 is described below

commit bba73d4e4e334da6c0ac91c34750d3b3a76a2a0d
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Dec 26 20:25:51 2020 +0700

    [OPENMEETINGS-2520] couple sonar issues are addressed
---
 .../src/main/java/org/apache/openmeetings/core/remote/KStream.java    | 4 ++--
 pom.xml                                                               | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
index 75fa04c..e311981 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/remote/KStream.java
@@ -162,7 +162,7 @@ public class KStream extends AbstractStream implements ISipCallbacks {
 		});
 	}
 
-	private void internalStartBroadcast(final StreamDesc sd, final String sdpOffer) throws Exception {
+	private void internalStartBroadcast(final StreamDesc sd, final String sdpOffer) {
 		outgoingMedia.addMediaSessionTerminatedListener(evt -> log.warn("Media stream terminated {}", sd));
 		flowoutSubscription = outgoingMedia.addMediaFlowOutStateChangeListener(evt -> {
 			log.info("Media Flow OUT STATE :: {}, evt {}, source {}"
@@ -491,7 +491,7 @@ public class KStream extends AbstractStream implements ISipCallbacks {
 
 	public void addCandidate(IceCandidate candidate, String uid) {
 		if (this.uid.equals(uid)) {
-			if (outgoingMedia == null || !(outgoingMedia instanceof WebRtcEndpoint)) {
+			if (!(outgoingMedia instanceof WebRtcEndpoint)) {
 				return;
 			}
 			((WebRtcEndpoint)outgoingMedia).addIceCandidate(candidate);
diff --git a/pom.xml b/pom.xml
index d6b59d5..adb3c2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
 		<jain-sip.version>1.2.307</jain-sip.version><!-- other versions are broken! -->
 		<jasny-bootstrap.version>3.1.3-2</jasny-bootstrap.version>
 		<!--  Exclude all generated code  -->
-		<sonar.exclusions>file:**/generated-sources/**, file:**/jquery-ui.css, file:**/cssemoticons.js</sonar.exclusions>
+		<sonar.exclusions>file:**/generated-sources/**, file:**/jquery-ui.css, file:**/cssemoticons.js, file:**/bootstrap-confirmation.js</sonar.exclusions>
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 		<sonar.junit.reportPaths>target/surefire-reports</sonar.junit.reportPaths>