From: Niki Roo <niki@nikiroo.be>
Date: Tue, 26 May 2020 19:05:55 +0000 (+0200)
Subject: Merge branch 'subtree'
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=abfeadcc2c0da88e32dd49291e8163880fe270f1;hp=-c;p=nikiroo-utils.git

Merge branch 'subtree'
---

abfeadcc2c0da88e32dd49291e8163880fe270f1
diff --combined src/be/nikiroo/utils/resources/Bundle.java
index 84efcea,fe3ac1a..fe3ac1a
--- a/src/be/nikiroo/utils/resources/Bundle.java
+++ b/src/be/nikiroo/utils/resources/Bundle.java
@@@ -5,6 -5,7 +5,7 @@@ import java.io.File
  import java.io.FileInputStream;
  import java.io.FileOutputStream;
  import java.io.IOException;
+ import java.io.InputStream;
  import java.io.InputStreamReader;
  import java.io.OutputStreamWriter;
  import java.io.Reader;
@@@ -1168,13 -1169,21 +1169,21 @@@ public class Bundle<E extends Enum<E>> 
  
  		boolean found = false;
  		if (!resetToDefault && dir != null) {
- 			// Look into Bundles.getDirectory() for .properties files
  			try {
+ 				// Look into Bundles.getDirectory() for .properties files
  				File file = getPropertyFile(dir, name.name(), locale);
  				if (file != null) {
- 					Reader reader = new InputStreamReader(new FileInputStream(
- 							file), "UTF-8");
- 					resetMap(new PropertyResourceBundle(reader));
+ 					InputStream in = new FileInputStream(file);
+ 					try {
+ 						Reader reader = new InputStreamReader(in, "UTF-8");
+ 						try {
+ 							resetMap(new PropertyResourceBundle(reader));
+ 						} finally {
+ 							reader.close();
+ 						}
+ 					} finally {
+ 						in.close();
+ 					}
  					found = true;
  				}
  			} catch (IOException e) {