GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-13 09:07:27 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#1998 P25 Traffic Channel Manager error ConcurrentModification on Allocated Channels Map, introduced in #1996

Browse Source
This commit is contained in:
Dennis Sheirer
2024-10-02 03:23:20 -04:00
parent 161595e7c8
commit 600db3fb8a
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/io/github/dsheirer/module/decode/p25/P25TrafficChannelManager.java
View File

@@ -70,7 +70,6 @@ import java.util.Queue;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.LinkedTransferQueue; import java.util.concurrent.LinkedTransferQueue;
import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantLock;
import java.util.function.BiConsumer;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@@ -171,23 +170,21 @@ public class P25TrafficChannelManager extends TrafficChannelManager implements I
try try
{ {
//Shutdown all existing traffic channels and clear the maps. //Shutdown all existing traffic channels and clear the maps.
mAllocatedTrafficChannelMap.forEach(new BiConsumer<Long, Channel>() List<Channel> trafficChannelsToDisable = new ArrayList<>(mAllocatedTrafficChannelMap.values());
{
@Override
public void accept(Long aLong, Channel channel)
{
if(!parentChannel.equals(channel))
{
broadcast(new ChannelEvent(channel, Event.REQUEST_DISABLE));
}
}
});
mAllocatedTrafficChannelMap.clear(); mAllocatedTrafficChannelMap.clear();
for(Channel channel : trafficChannelsToDisable)
{
if(!parentChannel.equals(channel))
{
broadcast(new ChannelEvent(channel, Event.REQUEST_DISABLE));
}
}
mTS1ChannelGrantEventMap.clear(); mTS1ChannelGrantEventMap.clear();
mTS2ChannelGrantEventMap.clear(); mTS2ChannelGrantEventMap.clear();
//Store the control channel in the allocated channel map so that we don't allocate a traffic channel against it //Store the current control channel in the allocated channel map so that we don't allocate a traffic channel against it
mAllocatedTrafficChannelMap.put(current, parentChannel); mAllocatedTrafficChannelMap.put(current, parentChannel);
} }
finally finally