Skip to content

Revert "Location NPE fix" #17

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

Merged
sbesson merged 1 commit into from
Sep 25, 2017
Merged

Revert "Location NPE fix" #17

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
8 changes: 3 additions & 5 deletions src/main/java/loci/common/Location.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,11 @@ public Location(File file) {
}

public Location(String parent, String child) {
this(parent == null ? child : parent + File.separator + child);
this(parent + File.separator + child);
}

public Location(Location parent, String child) {
this(parent == null ? (String) null : parent.getAbsolutePath(), child);
this(parent.getAbsolutePath(), child);
}

// -- Location API methods --
Expand Down Expand Up @@ -620,9 +620,7 @@ public String getParent() {

/* @see java.io.File#getParentFile() */
public Location getParentFile() {
String parent = this.getParent();
if (parent == null) return null;
return new Location(parent);
return new Location(getParent());
}

/* @see java.io.File#getPath() */
Expand Down
9 changes: 0 additions & 9 deletions src/test/java/loci/common/utests/LocationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
package loci.common.utests;

import static org.testng.AssertJUnit.assertEquals;
import static org.testng.AssertJUnit.assertNull;

import java.io.File;
import java.io.IOException;
Expand Down Expand Up @@ -176,14 +175,6 @@ public void testParent() {
file.getParentFile().getAbsolutePath());
}
}

@Test
public void testParentNull() {
Location nullParent = new Location((String) null, "nullParentFile");
assertNull(nullParent.getParentFile());
nullParent = new Location((Location) null, "nullParentFile");
assertNull(nullParent.getParentFile());
}

@Test
public void testIsDirectory() {
Expand Down