|
29 | 29 | importjava.io.BufferedReader; |
30 | 30 | importjava.io.FileInputStream; |
31 | 31 | importjava.io.FileOutputStream; |
| 32 | +importjava.io.IOException; |
32 | 33 | importjava.io.InputStreamReader; |
33 | 34 | importjava.io.PrintStream; |
34 | 35 | importjava.io.Reader; |
@@ -182,20 +183,28 @@ public static MapGeometry loadGeometryFromJSONFileDbg(String file_name) { |
182 | 183 | } |
183 | 184 |
|
184 | 185 | StringjsonString =null; |
| 186 | +Readerreader =null; |
185 | 187 | try { |
186 | 188 | FileInputStreamstream =newFileInputStream(file_name); |
187 | | -Readerreader =newBufferedReader(newInputStreamReader(stream)); |
| 189 | +reader =newBufferedReader(newInputStreamReader(stream)); |
188 | 190 | StringBuilderbuilder =newStringBuilder(); |
189 | 191 | char[]buffer =newchar[8192]; |
190 | 192 | intread; |
191 | 193 | while ((read =reader.read(buffer,0,buffer.length)) >0) { |
192 | 194 | builder.append(buffer,0,read); |
193 | 195 | } |
194 | | -stream.close(); |
195 | 196 |
|
196 | 197 | jsonString =builder.toString(); |
197 | 198 | }catch (Exceptionex) { |
198 | 199 | } |
| 200 | +finally { |
| 201 | +if (reader !=null) { |
| 202 | +try { |
| 203 | +reader.close(); |
| 204 | +}catch (IOExceptione) { |
| 205 | +} |
| 206 | +} |
| 207 | +} |
199 | 208 |
|
200 | 209 | MapGeometrymapGeom =OperatorImportFromJson.local().execute(Geometry.Type.Unknown,jsonString); |
201 | 210 | returnmapGeom; |
@@ -276,20 +285,28 @@ public static Geometry loadGeometryFromWKTFileDbg(String file_name) { |
276 | 285 | } |
277 | 286 |
|
278 | 287 | Strings =null; |
| 288 | +Readerreader =null; |
279 | 289 | try { |
280 | 290 | FileInputStreamstream =newFileInputStream(file_name); |
281 | | -Readerreader =newBufferedReader(newInputStreamReader(stream)); |
| 291 | +reader =newBufferedReader(newInputStreamReader(stream)); |
282 | 292 | StringBuilderbuilder =newStringBuilder(); |
283 | 293 | char[]buffer =newchar[8192]; |
284 | 294 | intread; |
285 | 295 | while ((read =reader.read(buffer,0,buffer.length)) >0) { |
286 | 296 | builder.append(buffer,0,read); |
287 | 297 | } |
288 | | -stream.close(); |
289 | 298 |
|
290 | 299 | s =builder.toString(); |
291 | 300 | }catch (Exceptionex) { |
292 | 301 | } |
| 302 | +finally { |
| 303 | +if (reader !=null) { |
| 304 | +try { |
| 305 | +reader.close(); |
| 306 | +}catch (IOExceptione) { |
| 307 | +} |
| 308 | +} |
| 309 | +} |
293 | 310 |
|
294 | 311 | returnOperatorImportFromWkt.local().execute(0,Geometry.Type.Unknown,s,null); |
295 | 312 | } |
|