Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-19 10:25:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up some io close() calls

Browse Source
This commit is contained in:
aumgn 2012-08-27 12:46:56 +02:00
parent 9637871969
commit 1fef255d77
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/com/sk89q/wepif/FlatFilePermissionsResolver.java
View File

@ -69,11 +69,11 @@ public class FlatFilePermissionsResolver implements PermissionsResolver {
public Map<String, Set<String>> loadGroupPermissions() { public Map<String, Set<String>> loadGroupPermissions() {
Map<String, Set<String>> userGroupPermissions = new HashMap<String, Set<String>>(); Map<String, Set<String>> userGroupPermissions = new HashMap<String, Set<String>>();
FileReader input = null; BufferedReader buff = null;
try { try {
input = new FileReader(this.groupFile); FileReader input = new FileReader(this.groupFile);
BufferedReader buff = new BufferedReader(input); buff = new BufferedReader(input);
String line; String line;
while ((line = buff.readLine()) != null) { while ((line = buff.readLine()) != null) {
@ -101,8 +101,8 @@ public class FlatFilePermissionsResolver implements PermissionsResolver {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
try { try {
if (input != null) { if (buff != null) {
input.close(); buff.close();
} }
} catch (IOException e2) { } catch (IOException e2) {
} }
@ -122,11 +122,11 @@ public class FlatFilePermissionsResolver implements PermissionsResolver {
defaultPermissionsCache = userGroupPermissions.get("default"); defaultPermissionsCache = userGroupPermissions.get("default");
} }
FileReader input = null; BufferedReader buff = null;
try { try {
input = new FileReader(this.userFile); FileReader input = new FileReader(this.userFile);
BufferedReader buff = new BufferedReader(input); buff = new BufferedReader(input);
String line; String line;
while ((line = buff.readLine()) != null) { while ((line = buff.readLine()) != null) {
@ -166,8 +166,8 @@ public class FlatFilePermissionsResolver implements PermissionsResolver {
e.printStackTrace(); e.printStackTrace();
} finally { } finally {
try { try {
if (input != null) { if (buff != null) {
input.close(); buff.close();
} }
} catch (IOException e2) { } catch (IOException e2) {
} }

2
src/main/java/com/sk89q/worldedit/data/LegacyChunkStore.java
View File

@ -120,7 +120,7 @@ public abstract class LegacyChunkStore extends ChunkStore {
return rootTag; return rootTag;
} finally { } finally {
stream.close(); nbt.close();
} }
} }

2
src/main/java/com/sk89q/worldedit/data/McRegionChunkStore.java
View File

@ -104,7 +104,7 @@ public abstract class McRegionChunkStore extends ChunkStore {
return rootTag; return rootTag;
} finally { } finally {
stream.close(); nbt.close();
} }
} }

1
src/main/java/com/sk89q/worldedit/schematic/MCEditSchematicFormat.java
View File

@ -68,6 +68,7 @@ public class MCEditSchematicFormat extends SchematicFormat {
// Schematic tag // Schematic tag
CompoundTag schematicTag = (CompoundTag) nbtStream.readTag(); CompoundTag schematicTag = (CompoundTag) nbtStream.readTag();
nbtStream.close();
if (!schematicTag.getName().equals("Schematic")) { if (!schematicTag.getName().equals("Schematic")) {
throw new DataException("Tag \"Schematic\" does not exist or is not first"); throw new DataException("Tag \"Schematic\" does not exist or is not first");
} }