Skip to content

Fixing possible null pointer dereference #1224

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
wants to merge 1 commit into
base: titan10
Choose a base branch
from
Open

Fixing possible null pointer dereference #1224

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
2 changes: 1 addition & 1 deletion titan-core/src/main/java/com/thinkaurelius/titan/core/TitanFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ private static ReadConfiguration getLocalConfiguration(String shortcutOrFile) {
@SuppressWarnings("unchecked")
private static ReadConfiguration getLocalConfiguration(File file) {
Preconditions.checkArgument(file != null && file.exists() && file.isFile() && file.canRead(),
"Need to specify a readable configuration file, but was given: %s", file.toString());
"Need to specify a readable configuration file, but was given: %s", file != null ? file.toString() : "null");

try {
PropertiesConfiguration configuration = new PropertiesConfiguration(file);
Expand Down
2 changes: 1 addition & 1 deletion titan-core/src/main/java/com/thinkaurelius/titan/diskstorage/keycolumnvalue/SliceQuery.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public boolean equals(Object other) {
if (this == other)
return true;

if (other == null && !getClass().isInstance(other))
if (other == null || !getClass().isInstance(other))
return false;

SliceQuery oth = (SliceQuery) other;
Expand Down
2 changes: 1 addition & 1 deletion ...c/main/java/com/thinkaurelius/titan/graphdb/configuration/GraphDatabaseConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1153,7 +1153,7 @@ public boolean apply(@Nullable Duration sd) {
ConfigOption.Type.MASKABLE, "unicast", new Predicate<String>() {
@Override
public boolean apply(@Nullable String s) {
return s!=null && s.equalsIgnoreCase("unicast") || s.equalsIgnoreCase("multicast");
return s!=null && (s.equalsIgnoreCase("unicast") || s.equalsIgnoreCase("multicast"));
}
});

Expand Down