Skip to content

flattened out that do/while loop that only ran once in DataChannelRer… #778

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
jabrena merged 3 commits into from
Dec 31, 2020
Merged

flattened out that do/while loop that only ran once in DataChannelRer… #778

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1be575c
flattened out that do/while loop that only ran once in DataChannelRer…
dwalend Dec 30, 2020
5cd2ad8
synchronized access to DataChannelRereader state-dependent methods an…
dwalend Dec 31, 2020
c1b7897
0 bytes read case should also be the empty string
dwalend Dec 31, 2020
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
24 changes: 13 additions & 11 deletions src/main/java/ev3dev/utils/DataChannelRereader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,15 @@ public DataChannelRereader(String pathString) {
/**
* @return a string made from the bytes in the file;
*/
public String readString() {
public synchronized String readString() {
try {
int n;
do {
byteBuffer.clear();
channel.position(0);
n = channel.read(byteBuffer);
if (n == -1) {
throw new IOException("Premature end of file ");
}
} while (n <= 0);
byteBuffer.clear();
int n = channel.read(byteBuffer,0);
if ((n == -1)||(n == 0)) {
return "";
} else if (n < -1) {
throw new RuntimeException("Unexpected read byte count of " + n + " while reading " + path);
}

byte[] bytes = byteBuffer.array();
if (bytes[n - 1] == '\n') {
Expand All @@ -71,8 +69,12 @@ public String readString() {
}
}

public Path getPath() {
return path;
}

@Override
public void close() throws IOException {
public synchronized void close() throws IOException {
channel.close();
}
}