From: Gustavo Martin Morcuende <gu.martinm@gmail.com>
Date: Thu, 5 Nov 2015 12:44:28 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/gumartinm/JavaForFun
X-Git-Url: https://git.gumartinm.name/?a=commitdiff_plain;h=9fa9a272ad7c2483837353246e8172dd726df39c;p=JavaForFun

Merge branch 'master' of https://github.com/gumartinm/JavaForFun

Conflicts:
	Allgemeines/FileSafeWriter/src/de/example/fsync/FileSafeWriterMain.java
---

9fa9a272ad7c2483837353246e8172dd726df39c
diff --cc Allgemeines/FileSafeWriter/src/de/example/fsync/FileSafeWriterMain.java
index c6144e2,47d4be9..c1821ce
--- a/Allgemeines/FileSafeWriter/src/de/example/fsync/FileSafeWriterMain.java
+++ b/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());
  	}