X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.acorn%2Fsrc%2Forg%2Fsimantics%2Facorn%2FFileIO.java;h=8f3009afab3f82b84c23156775efd901a925c1ae;hb=1dfeb7d5c49b1391cd9d877e1eddab18995cb151;hp=aa71732855bab8a6108d9fa2d837ebb3798a2839;hpb=c41f5d003bd0e73989f0f71cdd01a2a63b3b626d;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.acorn/src/org/simantics/acorn/FileIO.java b/bundles/org.simantics.acorn/src/org/simantics/acorn/FileIO.java
index aa7173285..8f3009afa 100644
--- a/bundles/org.simantics.acorn/src/org/simantics/acorn/FileIO.java
+++ b/bundles/org.simantics.acorn/src/org/simantics/acorn/FileIO.java
@@ -19,9 +19,12 @@ import java.util.Map;
 import java.util.Set;
 
 import org.simantics.databoard.file.RuntimeIOException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class FileIO {
-	
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(FileIO.class);
     private static final FileAttribute<?>[] NO_ATTRIBUTES = new FileAttribute[0];
     
     private static final Set<OpenOption> CREATE_OPTIONS = new HashSet<>(2);
@@ -66,15 +69,17 @@ public class FileIO {
 		ByteBuffer bb = ByteBuffer.wrap(bytes, 0, length);
 		try (FileChannel fc = FileChannel.open(path, options, NO_ATTRIBUTES)) {
             fc.write(bb);
+            
+            writePosition += length;
+            if(TRACE_PERF) {
+                long duration = System.nanoTime()-start;
+                double ds = 1e-9*duration;
+                LOGGER.info("Wrote " + bytes.length + " bytes @ " + 1e-6*bytes.length / ds + "MB/s");
+            }
+            return result;
+		} catch (Throwable t) {
+		    throw new IOException("An error occured file saving bytes for file " + path.toAbsolutePath().toString(), t);
 		}
-		
-        writePosition += length;
-		if(TRACE_PERF) {
-			long duration = System.nanoTime()-start;
-			double ds = 1e-9*duration;
-			System.err.println("Wrote " + bytes.length + " bytes @ " + 1e-6*bytes.length / ds + "MB/s");
-		}
-		return result;
 	}
 
     public synchronized byte[] readBytes(int offset, int length) throws IOException {
@@ -88,11 +93,11 @@ public class FileIO {
             }
             byte[] result = buf.array();
             if (result.length != length)
-                System.err.println("faa");
+                LOGGER.info("result length does not match expected {} {} {}", this, result.length, length);
             if (TRACE_PERF) {
                 long duration = System.nanoTime() - start;
                 double ds = 1e-9 * duration;
-                System.err.println("Read " + result.length + " bytes @ " + 1e-6 * result.length / ds + "MB/s");
+                LOGGER.info("Read " + result.length + " bytes @ " + 1e-6 * result.length / ds + "MB/s");
             }
             return result;
         }
@@ -133,10 +138,10 @@ public class FileIO {
 		
 		syncPath(test);
 		
-		long duration = System.nanoTime()-s;
-		System.err.println("Took " + 1e-6*duration + "ms.");
-		
-		
+		if (LOGGER.isDebugEnabled()) {
+    		long duration = System.nanoTime()-s;
+    		LOGGER.info("Took " + 1e-6*duration + "ms.");
+		}
 	}
 	
 }