Author: bleny Date: 2010-06-09 10:40:08 +0200 (Wed, 09 Jun 2010) New Revision: 70 Url: http://nuiton.org/repositories/revision/diswork/70 Log: demo avec traces ; style Modified: trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/Demo.java trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/storage/Storage.java trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/AbstractDisworkFileSystemTest.java Modified: trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/Demo.java =================================================================== --- trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/Demo.java 2010-06-08 14:35:06 UTC (rev 69) +++ trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/Demo.java 2010-06-09 08:40:08 UTC (rev 70) @@ -63,6 +63,7 @@ InputStream source = IOUtils.toInputStream(job); log.info("writing job " + waitingForJob + " (" + randomInteger + ")"); + System.out.println("submited job " + randomInteger); fileSystem.write(waitingForJob, source); source.close(); } else { @@ -76,6 +77,8 @@ Integer result = Integer.parseInt(resultString); log.info("result is " + result + " (expected : " + expectedResult + ")"); + System.out.println("job result published " + + result); fileSystem.delete(resultPath); fileSystem.delete(waitingForJob); waitingForJob = null; @@ -118,11 +121,15 @@ log.info("reading the job " + jobPath); InputStream in = fileSystem.read(jobPath); String operation = IOUtils.toString(in); - // in.close(); + in.close(); log.info("operation to do " + operation); + System.out.println("job found " + + operation); Integer i = Integer.parseInt(operation); i += 1; String result = i.toString(); + System.out.println("published result " + + result); log.info("result is " + result); InputStream source = IOUtils.toInputStream(result); Modified: trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/storage/Storage.java =================================================================== --- trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/storage/Storage.java 2010-06-08 14:35:06 UTC (rev 69) +++ trunk/diswork-fs/src/main/java/org/nuiton/diswork/fs/storage/Storage.java 2010-06-09 08:40:08 UTC (rev 70) @@ -449,7 +449,7 @@ } } - private boolean isLockStillOwned(String key) { + protected boolean isLockStillOwned(String key) { String lockKey = keyToLockKey(key); byte[] lock = map.get(lockKey); String lockOwner = EntryUtil.getOwnerFromLock(lock); Modified: trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/AbstractDisworkFileSystemTest.java =================================================================== --- trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/AbstractDisworkFileSystemTest.java 2010-06-08 14:35:06 UTC (rev 69) +++ trunk/diswork-fs/src/test/java/org/nuiton/diswork/fs/AbstractDisworkFileSystemTest.java 2010-06-09 08:40:08 UTC (rev 70) @@ -25,7 +25,7 @@ import org.nuiton.util.FileUtil; -public abstract class AbstractDisworkFileSystemTest { +public abstract class AbstractDisworkFileSystemTest { /** * a place to store files for the test it's a subdirectory of the OS temp