natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cassandra-4.1' into trunk

This commit is contained in:
Jordan West 2023-01-07 13:45:28 -08:00
parent d7c5c547f0 073f7c36fa
commit baca1dd9be
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/java/org/apache/cassandra/schema/PartitionDenylist.java
View File

@ -392,7 +392,7 @@ public class PartitionDenylist
/**
* Attempts to reload the DenylistEntry data from CQL for the given TableId and key count.
* @return null if we do not find the data; allows cache reloader to preserve old value
* @return empty denylist if we do not or cannot find the data, preserving the old value, otherwise the new value
*/
private DenylistEntry getDenylistForTableFromCQL(final TableId tid, int limit)
{
@ -449,8 +449,8 @@ public class PartitionDenylist
}
catch (final RequestExecutionException e)
{
logger.error("Error reading partition_denylist table for {}/{}. Returning empty list.", tmd.keyspace, tmd.name, e);
return null;
logger.error("Error reading partition_denylist table for {}/{}. Returning empty denylist.", tmd.keyspace, tmd.name, e);
return new DenylistEntry();
}
}