Merging from trunk r1617822:1618206 in the Java tree

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1620339 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 7 deletions

diff --git a/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
index 5a3c0182fd..845e7e58c3 100644
--- a/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/qpid/java/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
@@ -90,16 +90,18 @@ public class QpidTestCase extends TestCase
                 if (file.exists())
                 {
                     _logger.info("Using exclude file: " + uri);
-                    try
+                    try(FileReader fileReader = new FileReader(file))
                     {
-                        BufferedReader in = new BufferedReader(new FileReader(file));
-                        String excludedTest = in.readLine();
-                        do
+                        try(BufferedReader in = new BufferedReader(fileReader))
                         {
-                            exclusionList.add(excludedTest);
-                            excludedTest = in.readLine();
+                            String excludedTest = in.readLine();
+                            do
+                            {
+                                exclusionList.add(excludedTest);
+                                excludedTest = in.readLine();
+                            }
+                            while (excludedTest != null);
                         }
-                        while (excludedTest != null);
                     }
                     catch (IOException e)
                     {