Clean up the close and safeclose methods in the printers.

Keeps FileNames public.
neo4j · Jun 2, 2016 · 26f9f6d · 26f9f6d
1 parent 585308a
commit 26f9f6d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/...e/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/DumpSegmentedRaftLog.java b/...e/core-edge/src/main/java/org/neo4j/coreedge/raft/log/segmented/DumpSegmentedRaftLog.java
@@ -137,7 +137,7 @@ public PrintStream getFor( String file ) throws FileNotFoundException
             File dir = absoluteFile.isDirectory() ? absoluteFile : absoluteFile.getParentFile();
             if ( !dir.equals( directory ) )
             {
-                safeClose();
+                close();
                 File dumpFile = new File( dir, "dump-logical-log.txt" );
                 System.out.println( "Redirecting the output to " + dumpFile.getPath() );
                 out = new PrintStream( dumpFile );
@@ -146,18 +146,13 @@ public PrintStream getFor( String file ) throws FileNotFoundException
             return out;
         }
 
-        private void safeClose()
+        @Override
+        public void close()
         {
             if ( out != null )
             {
                 out.close();
             }
         }
-
-        @Override
-        public void close()
-        {
-            safeClose();
-        }
     }
 }
diff --git a/tools/src/main/java/org/neo4j/tools/dump/DumpLogicalLog.java b/tools/src/main/java/org/neo4j/tools/dump/DumpLogicalLog.java
@@ -212,7 +212,7 @@ public PrintStream getFor( String file ) throws FileNotFoundException
             File dir = absoluteFile.isDirectory() ? absoluteFile : absoluteFile.getParentFile();
             if ( !dir.equals( directory ) )
             {
-                safeClose();
+                close();
                 File dumpFile = new File( dir, "dump-logical-log.txt" );
                 System.out.println( "Redirecting the output to " + dumpFile.getPath() );
                 out = new PrintStream( dumpFile );
@@ -221,19 +221,14 @@ public PrintStream getFor( String file ) throws FileNotFoundException
             return out;
         }
 
-        private void safeClose()
+        @Override
+        public void close()
         {
             if ( out != null )
             {
                 out.close();
             }
         }
-
-        @Override
-        public void close()
-        {
-            safeClose();
-        }
     }
 
     public static TimeZone parseTimeZoneConfig( Args arguments )