commit ee05e902971fe050fd7544301b01e46a8c6a8dcf
author Sami Kalliomäki <sakal@webrtc.org> Fri Sep 28 14:38:21 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Fri Sep 28 13:25:43 2018 +0000
tree 9a6def0cdf8b23a7f999aecb0a0aac5e93131780
parent dca5a2ca735f25f70c161c0b47cea032f44ee90b

Throw IllegalStateException if native objects are used after dispose.

This makes it easier to debug issues related to double dispose /
use after dispose.

Bug: webrtc:7566, webrtc:8297
Change-Id: I07429b2b794deabb62b5f3ea1cf92eea6f66a149
Reviewed-on: https://webrtc-review.googlesource.com/102540
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Paulina Hensman <phensman@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24894}

sdk/android/api/org/webrtc/RtpReceiver.java

diff --git a/sdk/android/api/org/webrtc/RtpReceiver.java b/sdk/android/api/org/webrtc/RtpReceiver.java
index 4da7537..8be494f 100644
--- a/sdk/android/api/org/webrtc/RtpReceiver.java
+++ b/sdk/android/api/org/webrtc/RtpReceiver.java
@@ -22,7 +22,7 @@
     public void onFirstPacketReceived(MediaStreamTrack.MediaType media_type);
   }
 
-  final long nativeRtpReceiver;
+  private long nativeRtpReceiver;
   private long nativeObserver;
 
   @Nullable private MediaStreamTrack cachedTrack;
@@ -40,28 +40,34 @@
   }
 
   public boolean setParameters(@Nullable RtpParameters parameters) {
+    checkRtpReceiverExists();
     return parameters == null ? false : nativeSetParameters(nativeRtpReceiver, parameters);
   }
 
   public RtpParameters getParameters() {
+    checkRtpReceiverExists();
     return nativeGetParameters(nativeRtpReceiver);
   }
 
   public String id() {
+    checkRtpReceiverExists();
     return nativeGetId(nativeRtpReceiver);
   }
 
   @CalledByNative
   public void dispose() {
+    checkRtpReceiverExists();
     cachedTrack.dispose();
     if (nativeObserver != 0) {
       nativeUnsetObserver(nativeRtpReceiver, nativeObserver);
       nativeObserver = 0;
     }
     JniCommon.nativeReleaseRef(nativeRtpReceiver);
+    nativeRtpReceiver = 0;
   }
 
   public void SetObserver(Observer observer) {
+    checkRtpReceiverExists();
     // Unset the existing one before setting a new one.
     if (nativeObserver != 0) {
       nativeUnsetObserver(nativeRtpReceiver, nativeObserver);
@@ -70,9 +76,16 @@
   }
 
   public void setFrameDecryptor(FrameDecryptor frameDecryptor) {
+    checkRtpReceiverExists();
     nativeSetFrameDecryptor(nativeRtpReceiver, frameDecryptor.getNativeFrameDecryptor());
   }
 
+  private void checkRtpReceiverExists() {
+    if (nativeRtpReceiver == 0) {
+      throw new IllegalStateException("RtpReceiver has been disposed.");
+    }
+  }
+
   // This should increment the reference count of the track.
   // Will be released in dispose().
   private static native long nativeGetTrack(long rtpReceiver);