ProtobufBridge: Get rid of some unnecessary non-null assertions

This commit is contained in:
Sapphire
2026-03-13 16:13:35 -05:00
parent 908cb76c9d
commit 10426cbe78
2 changed files with 7 additions and 7 deletions

View File

@@ -44,7 +44,7 @@ abstract class ProtobufBridge(@JvmField protected val bridgeName: String) : ISte
protected abstract fun signalSend()
@BridgeThread
protected abstract fun sendMessageReal(message: ProtobufMessage?): Boolean
protected abstract fun sendMessageReal(message: ProtobufMessage): Boolean
private var remoteProtocolVersion: Int = 0
@@ -63,7 +63,7 @@ abstract class ProtobufBridge(@JvmField protected val bridgeName: String) : ISte
protected fun updateMessageQueue() {
var message: ProtobufMessage?
while ((outputQueue.poll().also { message = it }) != null) {
if (!sendMessageReal(message)) return
if (!sendMessageReal(message!!)) return
}
}
@@ -200,12 +200,12 @@ abstract class ProtobufBridge(@JvmField protected val bridgeName: String) : ISte
}
tracker = createNewTracker(trackerAdded)
synchronized(remoteTrackersBySerial) {
remoteTrackersBySerial.put(tracker!!.name, tracker)
remoteTrackersBySerial.put(tracker.name, tracker)
}
synchronized(remoteTrackersByTrackerId) {
remoteTrackersByTrackerId.put(tracker!!.trackerNum, tracker)
remoteTrackersByTrackerId.put(tracker.trackerNum, tracker)
}
instance.registerTracker(tracker!!)
instance.registerTracker(tracker)
}
@VRServerThread

View File

@@ -112,10 +112,10 @@ class UnixSocketBridge(
}
@BridgeThread
override fun sendMessageReal(message: ProtobufMessage?): Boolean {
override fun sendMessageReal(message: ProtobufMessage): Boolean {
channel?.let { channel ->
try {
val size = message!!.getSerializedSize() + 4
val size = message.getSerializedSize() + 4
src.putInt(size)
val serialized = message.toByteArray()
src.put(serialized)