Browse Source

JAVA: Release InputStreams after using them.

Review URL: http://codereview.appspot.com/5263046
pull/567/head
Shaopeng Jia 14 years ago
committed by Mihaela Rosca
parent
commit
21ce203880
2 changed files with 29 additions and 3 deletions
  1. +13
    -1
      java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java
  2. +16
    -2
      java/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java

+ 13
- 1
java/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java View File

@ -611,7 +611,7 @@ public class PhoneNumberUtil {
private void loadMetadataForRegionFromFile(String filePrefix, String regionCode) {
InputStream source =
PhoneNumberUtil.class.getResourceAsStream(filePrefix + "_" + regionCode);
ObjectInputStream in;
ObjectInputStream in = null;
try {
in = new ObjectInputStream(source);
PhoneMetadataCollection metadataCollection = new PhoneMetadataCollection();
@ -621,6 +621,18 @@ public class PhoneNumberUtil {
}
} catch (IOException e) {
LOGGER.log(Level.WARNING, e.toString());
} finally {
close(in);
}
}
private static void close(InputStream in) {
if (in != null) {
try {
in.close();
} catch (IOException e) {
LOGGER.log(Level.WARNING, e.toString());
}
}
}


+ 16
- 2
java/src/com/google/i18n/phonenumbers/geocoding/PhoneNumberOfflineGeocoder.java View File

@ -59,12 +59,14 @@ public class PhoneNumberOfflineGeocoder {
private void loadMappingFileProvider() {
InputStream source =
PhoneNumberOfflineGeocoder.class.getResourceAsStream(phonePrefixDataDirectory + "config");
ObjectInputStream in;
ObjectInputStream in = null;
try {
in = new ObjectInputStream(source);
mappingFileProvider.readExternal(in);
} catch (IOException e) {
LOGGER.log(Level.WARNING, e.toString());
} finally {
close(in);
}
}
@ -83,7 +85,7 @@ public class PhoneNumberOfflineGeocoder {
private void loadAreaCodeMapFromFile(String fileName) {
InputStream source =
PhoneNumberOfflineGeocoder.class.getResourceAsStream(phonePrefixDataDirectory + fileName);
ObjectInputStream in;
ObjectInputStream in = null;
try {
in = new ObjectInputStream(source);
AreaCodeMap map = new AreaCodeMap();
@ -91,6 +93,18 @@ public class PhoneNumberOfflineGeocoder {
availablePhonePrefixMaps.put(fileName, map);
} catch (IOException e) {
LOGGER.log(Level.WARNING, e.toString());
} finally {
close(in);
}
}
private static void close(InputStream in) {
if (in != null) {
try {
in.close();
} catch (IOException e) {
LOGGER.log(Level.WARNING, e.toString());
}
}
}


Loading…
Cancel
Save