Skip to content

check if the system is being replaced before throwing an error #348

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kalynstricklin wants to merge 1 commit into
base: master
Choose a base branch
from
Open

check if the system is being replaced before throwing an error #348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ...orhub-core/src/main/java/org/sensorhub/impl/datastore/mem/InMemoryCommandStreamStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,8 +273,13 @@ protected synchronized ICommandStreamInfo put(CommandStreamKey csKey, ICommandSt
var newValidTime = csInfo.getValidTime().begin();

// error if command stream with same system/name/validTime already exists
// unless updating the same key
if (prevValidTime.equals(newValidTime))
{
if (replace && key.equals(csKey))
return map.put(csKey, csInfo);
throw new DataStoreException(DataStoreUtils.ERROR_EXISTING_COMMANDSTREAM);
}

// don't add if previous entry had a more recent valid time
// or if new entry is dated in the future
Expand Down
5 changes: 5 additions & 0 deletions sensorhub-core/src/main/java/org/sensorhub/impl/datastore/mem/InMemoryDataStreamStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,8 +224,13 @@ protected synchronized IDataStreamInfo put(DataStreamKey dsKey, IDataStreamInfo
var newValidTime = dsInfo.getValidTime().begin();

// error if datastream with same system/name/validTime already exists
// unless updating the same key
if (prevValidTime.equals(newValidTime))
{
if (replace && key.equals(dsKey))
return map.put(dsKey, dsInfo);
throw new DataStoreException(DataStoreUtils.ERROR_EXISTING_DATASTREAM);
}

// don't add if previous entry had a more recent valid time
// or if new entry is dated in the future
Expand Down
Loading