Prevent a possible memory leak of object references

This may be the cause of streams crashing after ~30mins

Author: kiall

app/src/main/java/ie/macinnes/tvheadend/player/HtspDataSource.java

@@ -26,6 +26,7 @@
 import com.google.android.exoplayer2.upstream.DataSpec;
 
 import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.ObjectOutput;
 import java.io.ObjectOutputStream;
@@ -38,7 +39,7 @@
 import ie.macinnes.htsp.tasks.Subscriber;
 import ie.macinnes.tvheadend.Constants;
 
-public class HtspDataSource implements DataSource, Subscriber.Listener {
+public class HtspDataSource implements DataSource, Subscriber.Listener, Closeable {
     private static final String TAG = HtspDataSource.class.getName();
     private static final int FIFTEEN_MB = 15*1024*1024;
 
@@ -152,6 +153,8 @@ public Uri getUri() {
 
     @Override
     public void close() throws IOException {
+        mIsOpen = false;
+
         mConnection.removeAuthenticationListener(mSubscriber);
         mSubscriber.unsubscribe();
     }
@@ -183,9 +186,9 @@ private void serializeMessageToBuffer(@NonNull HtspMessage message) {
 
         mLock.lock();
         try (
-                ObjectOutput objectOutput = new ObjectOutputStream(outputStream);
+                ObjectOutputStream objectOutput = new ObjectOutputStream(outputStream);
         ) {
-            objectOutput.writeObject(message);
+            objectOutput.writeUnshared(message);
             objectOutput.flush();
 
             mBuffer.position(mBuffer.limit());

app/src/main/java/ie/macinnes/tvheadend/player/HtspExtractor.java

@@ -100,12 +100,12 @@ public int read(ExtractorInput input, PositionHolder seekPosition) throws IOExce
             Log.v(TAG, "Read " + bytesRead + " bytes");
 
         ByteArrayInputStream inputStream = new ByteArrayInputStream(rawBytes, 0, bytesRead);
-        ObjectInput objectInput = null;
+        ObjectInputStream objectInput = null;
 
         try {
             while (inputStream.available() > 0) {
                 objectInput = new ObjectInputStream(inputStream);
-                handleMessage((HtspMessage) objectInput.readObject());
+                handleMessage((HtspMessage) objectInput.readUnshared());
             }
         } catch (IOException e) {
             // Ignore?