Skip to content
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

Jump to bottom

Fixing squid:S2259 - Null pointers should not be dereferenced #604

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

Fixing squid:S2259 - Null pointers should not be dereferenced #604

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
17 changes: 6 additions & 11 deletions astyanax-cql/src/main/java/com/netflix/astyanax/cql/reads/CFRowRangeQueryGen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,18 +186,13 @@ private void bindWhereClauseForRowRange(List<Object> values, RowRange<?> rowRang
BigInteger startTokenB = rowRange.getStartToken() != null ? new BigInteger(rowRange.getStartToken()) : null;
BigInteger endTokenB = rowRange.getEndToken() != null ? new BigInteger(rowRange.getEndToken()) : null;

Long startToken = startTokenB.longValue();
Long endToken = endTokenB.longValue();

if (startToken != null && endToken != null) {
if (startToken != null) {
values.add(startToken);
}
if (endToken != null) {
values.add(endToken);
}
if (startTokenB != null) {
values.add(startTokenB.longValue());
}

if (endTokenB != null) {
values.add(endTokenB.longValue());
}

if (rowRange.getCount() > 0) {
// TODO: fix this
//where.limit(rowRange.getCount());
Expand Down
17 changes: 6 additions & 11 deletions astyanax-cql/src/main/java/com/netflix/astyanax/cql/reads/FlatTableRowSliceQueryGen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,18 +219,13 @@ private void bindWhereClauseForRowRange(List<Object> values, RowRange<?> rowRang
} else if (tokenIsPresent) {

BigInteger startTokenB = rowRange.getStartToken() != null ? new BigInteger(rowRange.getStartToken()) : null;
BigInteger endTokenB = rowRange.getEndToken() != null ? new BigInteger(rowRange.getEndToken()) : null;
BigInteger endTokenB = rowRange.getEndToken() != null ? new BigInteger(rowRange.getEndToken()) : null;

Long startToken = startTokenB.longValue();
Long endToken = endTokenB.longValue();

if (startToken != null && endToken != null) {
if (startToken != null) {
values.add(startToken);
}
if (endToken != null) {
values.add(endToken);
}
if (startTokenB != null) {
values.add(startTokenB.longValue());
}
if (endTokenB != null) {
values.add(endTokenB.longValue());
}

if (rowRange.getCount() > 0) {
Expand Down