Index: trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 2986)
+++ trunk/test/functional/org/openstreetmap/josm/io/MultiFetchServerObjectReaderTest.java	(revision 2990)
@@ -204,20 +204,19 @@
         createDataSetOnServer(testDataSet);
 
-        PrintWriter pw = null;
         try {
-            pw = new PrintWriter(
+            PrintWriter pw = new PrintWriter(
                     new FileWriter(dataSetCacheOutputFile)
             );
+            logger.info(MessageFormat.format("caching test data set in ''{0}'' ...", dataSetCacheOutputFile.toString()));
+            OsmWriter w = new OsmWriter(pw, false, testDataSet.getVersion());
+            w.header();
+            w.writeDataSources(testDataSet);
+            w.writeContent(testDataSet);
+            w.footer();
+            w.close();
+            pw.close();
         } catch(IOException e) {
             fail(MessageFormat.format("failed to open file ''{0}'' for writing", dataSetCacheOutputFile.toString()));
         }
-        logger.info(MessageFormat.format("caching test data set in ''{0}'' ...", dataSetCacheOutputFile.toString()));
-        OsmWriter w = new OsmWriter(pw, false, testDataSet.getVersion());
-        w.header();
-        w.writeDataSources(testDataSet);
-        w.writeContent(testDataSet);
-        w.footer();
-        w.close();
-        pw.close();
     }
 
Index: trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java
===================================================================
--- trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 2986)
+++ trunk/test/functional/org/openstreetmap/josm/io/OsmServerBackreferenceReaderTest.java	(revision 2990)
@@ -211,20 +211,19 @@
         createDataSetOnServer(testDataSet);
 
-        PrintWriter pw = null;
         try {
-            pw = new PrintWriter(
+            PrintWriter pw = new PrintWriter(
                     new FileWriter(dataSetCacheOutputFile)
             );
+            logger.info(MessageFormat.format("caching test data set in ''{0}'' ...", dataSetCacheOutputFile.toString()));
+            OsmWriter w = new OsmWriter(pw, false, testDataSet.getVersion());
+            w.header();
+            w.writeDataSources(testDataSet);
+            w.writeContent(testDataSet);
+            w.footer();
+            w.close();
+            pw.close();
         } catch(IOException e) {
             fail(MessageFormat.format("failed to open file ''{0}'' for writing", dataSetCacheOutputFile.toString()));
         }
-        logger.info(MessageFormat.format("caching test data set in ''{0}'' ...", dataSetCacheOutputFile.toString()));
-        OsmWriter w = new OsmWriter(pw, false, testDataSet.getVersion());
-        w.header();
-        w.writeDataSources(testDataSet);
-        w.writeContent(testDataSet);
-        w.footer();
-        w.close();
-        pw.close();
     }