mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-17 02:57:35 -05:00
Move BinaryMessage isFull() check into try block to prevent NPE. (#881)
From issue 879: When a BitSetFullException is caught and reset(0) is called, the BinaryMessage is set to null. This should resolve issue 879.
This commit is contained in:
@@ -201,6 +201,17 @@ public class P25P1MessageFramer implements Listener<Dibit>, IP25P1DataUnitDetect
|
|||||||
{
|
{
|
||||||
mBinaryMessage.add(dibit.getBit1());
|
mBinaryMessage.add(dibit.getBit1());
|
||||||
mBinaryMessage.add(dibit.getBit2());
|
mBinaryMessage.add(dibit.getBit2());
|
||||||
|
|
||||||
|
if(mBinaryMessage.isFull())
|
||||||
|
{
|
||||||
|
//TDU's have a trailing status symbol that has to be removed -- set flag to true to suppress it.
|
||||||
|
if(mDataUnitID.hasTrailingStatusDibit())
|
||||||
|
{
|
||||||
|
mTrailingDibitsToSuppress = 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
dispatchMessage();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
catch(BitSetFullException bsfe)
|
catch(BitSetFullException bsfe)
|
||||||
{
|
{
|
||||||
@@ -209,17 +220,6 @@ public class P25P1MessageFramer implements Listener<Dibit>, IP25P1DataUnitDetect
|
|||||||
//Reset so that we can start over again
|
//Reset so that we can start over again
|
||||||
reset(0);
|
reset(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(mBinaryMessage.isFull())
|
|
||||||
{
|
|
||||||
//TDU's have a trailing status symbol that has to be removed -- set flag to true to suppress it.
|
|
||||||
if(mDataUnitID.hasTrailingStatusDibit())
|
|
||||||
{
|
|
||||||
mTrailingDibitsToSuppress = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
dispatchMessage();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user