Merge branch 'master' of https://github.com/gumartinm/JavaForFun
authorGustavo Martin Morcuende <gu.martinm@gmail.com>
Thu, 5 Nov 2015 12:44:28 +0000 (13:44 +0100)
committerGustavo Martin Morcuende <gu.martinm@gmail.com>
Thu, 5 Nov 2015 12:44:28 +0000 (13:44 +0100)
Conflicts:
Allgemeines/FileSafeWriter/src/de/example/fsync/FileSafeWriterMain.java

1  2 
Allgemeines/FileSafeWriter/src/de/example/fsync/FileSafeWriterMain.java

@@@ -19,9 -19,9 +19,8 @@@ public class FileSafeWriterMain 
        private static final File exampleFile = new File("/tmp/fileSafeWriterExample");
  
        public static void main(String[] args) throws FileNotFoundException, IOException {
--              
 -              final FileSafeWriter safeFileWriter = new FileSafeWriter(new ExampleSafeWriter(9999));
 -        safeFileWriter.writeFile(exampleFile);
 +              final FileSafeWriter fileSafeWriter = new FileSafeWriter(new ExampleSafeWriter(9999));
 +              fileSafeWriter.writeFile(exampleFile);
          
          System.out.println("Result: " + getPersistedData());
        }