Skip to content

close a stream in debug methods #252

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
stolstov merged 1 commit into from
Dec 6, 2019
Merged

close a stream in debug methods #252

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
25 changes: 21 additions & 4 deletions src/main/java/com/esri/core/geometry/OperatorFactoryLocal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import java.io.BufferedReader;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.PrintStream;
import java.io.Reader;
Expand Down Expand Up @@ -182,20 +183,28 @@ public static MapGeometry loadGeometryFromJSONFileDbg(String file_name) {
}

String jsonString = null;
Reader reader = null;
try {
FileInputStream stream = new FileInputStream(file_name);
Reader reader = new BufferedReader(new InputStreamReader(stream));
reader = new BufferedReader(new InputStreamReader(stream));
StringBuilder builder = new StringBuilder();
char[] buffer = new char[8192];
int read;
while ((read = reader.read(buffer, 0, buffer.length)) > 0) {
builder.append(buffer, 0, read);
}
stream.close();

jsonString = builder.toString();
} catch (Exception ex) {
}
finally {
if (reader != null) {
try {
reader.close();
} catch (IOException e) {
}
}
}

MapGeometry mapGeom = OperatorImportFromJson.local().execute(Geometry.Type.Unknown, jsonString);
return mapGeom;
Expand Down Expand Up @@ -276,20 +285,28 @@ public static Geometry loadGeometryFromWKTFileDbg(String file_name) {
}

String s = null;
Reader reader = null;
try {
FileInputStream stream = new FileInputStream(file_name);
Reader reader = new BufferedReader(new InputStreamReader(stream));
reader = new BufferedReader(new InputStreamReader(stream));
StringBuilder builder = new StringBuilder();
char[] buffer = new char[8192];
int read;
while ((read = reader.read(buffer, 0, buffer.length)) > 0) {
builder.append(buffer, 0, read);
}
stream.close();

s = builder.toString();
} catch (Exception ex) {
}
finally {
if (reader != null) {
try {
reader.close();
} catch (IOException e) {
}
}
}

return OperatorImportFromWkt.local().execute(0, Geometry.Type.Unknown, s, null);
}
Expand Down