Skip to content

Remove useless null checks (CodeQL java/useless-null-check) #236

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
vharseko wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove useless null checks (CodeQL java/useless-null-check) #236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb9028d
Remove useless null checks (CodeQL java/useless-null-check)
vharseko Jul 8, 2026
fdaa2f0
Merge branch 'master' into features/codeql-useless-null-check
vharseko Jul 9, 2026
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
6 changes: 3 additions & 3 deletions commons/geo/src/main/java/ru/org/openam/geo/Info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions copyright [year] [name of copyright owner]".
*
* Copyright 2020-2024 3A Systems LLC.
* Copyright 2020-2026 3A Systems LLC.
*/

package ru.org.openam.geo;
Expand Down Expand Up @@ -48,9 +48,9 @@ public Boolean isLAN(){
@Override
public String toString() {
if (ip!=null&&ip.isSiteLocalAddress())
return MessageFormat.format("{0} ({1})",(ip!=null)?ip.getHostAddress():ipString,"LAN");
return MessageFormat.format("{0} ({1})",ip.getHostAddress(),"LAN");
else if (ip!=null&&ip.isLoopbackAddress())
return MessageFormat.format("{0} ({1})",(ip!=null)?ip.getHostAddress():ipString,"LOCALHOST");
return MessageFormat.format("{0} ({1})",ip.getHostAddress(),"LOCALHOST");
else if (l!=null)
return MessageFormat.format("{0} ({1}:{2}/{3})",
(ip!=null)?ip.getHostAddress():ipString,
Expand Down
7 changes: 3 additions & 4 deletions commons/http-framework/core/src/main/java/org/forgerock/http/protocol/Cookie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*
* Copyright 2010–2011 ApexIdentity Inc.
* Portions Copyright 2011-2015 ForgeRock AS.
* Portions Copyrighted 2026 3A Systems, LLC
*/

package org.forgerock.http.protocol;
Expand Down Expand Up @@ -285,7 +286,7 @@ public int hashCode() {
result = prime * result + (maxAge == null ? 0 : maxAge.hashCode());
result = prime * result + (name == null ? 0 : name.hashCode());
result = prime * result + (path == null ? 0 : path.hashCode());
result = prime * result + (port == null ? 0 : port.hashCode());
result = prime * result + port.hashCode();
result = prime * result + (secure == null ? 0 : secure.hashCode());
result = prime * result + (sameSite == null ? 0 : sameSite.hashCode());
result = prime * result + (value == null ? 0 : value.hashCode());
Expand Down Expand Up @@ -488,9 +489,7 @@ public String toString() {
if (path != null) {
builder.append("path=").append(path).append(" ");
}
if (port != null) {
builder.append("port=").append(port).append(" ");
}
builder.append("port=").append(port).append(" ");
if (secure != null) {
builder.append("secure=").append(secure).append(" ");
}
Expand Down
7 changes: 3 additions & 4 deletions .../launcher/launcher/src/main/java/org/forgerock/commons/launcher/OSGiFrameworkService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,14 +334,13 @@ public void init() throws Exception {
);
}
} else {
input =
new BufferedReader(new InputStreamReader(Main.class
.getResourceAsStream("/launcher.json")));
if (null == input) {
final InputStream configStream = Main.class.getResourceAsStream("/launcher.json");
if (null == configStream) {
throw new IllegalArgumentException(
"Boot OSGi configuration file does not exists on CLASSPATH: "
+ Main.class.getResource("/").toString() + "/launcher.json");
}
input = new BufferedReader(new InputStreamReader(configStream));
}
launcherConfiguration = new JsonValue((new JSONParser()).parse(input));
launcherConfiguration.getTransformers().add(transformer);
Expand Down
16 changes: 6 additions & 10 deletions persistit/core/src/main/java/com/persistit/Persistit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1736,12 +1736,10 @@ private void interruptActiveThreads(final long timeout) throws PersistitInterrup
*/
public void crash() {
final JournalManager journalManager = _journalManager;
if (journalManager != null) {
try {
journalManager.crash();
} catch (final IOException e) {
_logBase.exception.log(e);
}
try {
journalManager.crash();
} catch (final IOException e) {
_logBase.exception.log(e);
}
//
// Even on simulating a crash we need to try to close
Expand All @@ -1757,10 +1755,8 @@ public void crash() {
}
}
final Map<Integer, BufferPool> buffers = _bufferPoolTable;
if (buffers != null) {
for (final BufferPool pool : buffers.values()) {
pool.crash();
}
for (final BufferPool pool : buffers.values()) {
pool.crash();
}
_transactionIndex.crash();
_cleanupManager.crash();
Expand Down
Loading