Author: bleny Date: 2010-05-04 19:54:32 +0200 (Tue, 04 May 2010) New Revision: 22 Url: http://nuiton.org/repositories/revision/diswork/22 Log: timeout pour que hudson broute pas trop Removed: trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/JGroupsTest.java Modified: trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/DisworkFileSystem.java trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/SimpleDownload.java Modified: trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/DisworkFileSystem.java =================================================================== --- trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/DisworkFileSystem.java 2010-05-04 17:33:12 UTC (rev 21) +++ trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/DisworkFileSystem.java 2010-05-04 17:54:32 UTC (rev 22) @@ -66,8 +66,9 @@ try { SimpleDownload simpleDownload = new SimpleDownload(path, lookUpService, downloadService); - simpleDownload.initiateDownload(); - simpleDownload.startDownload(); + boolean fileFound = simpleDownload.initiateDownload(); + if (fileFound) + simpleDownload.startDownload(); } catch (Exception e) { // TODO Auto-generated catch block e.printStackTrace(); Deleted: trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/JGroupsTest.java =================================================================== --- trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/JGroupsTest.java 2010-05-04 17:33:12 UTC (rev 21) +++ trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/JGroupsTest.java 2010-05-04 17:54:32 UTC (rev 22) @@ -1,35 +0,0 @@ -package org.nuiton.disworkfs; - -import org.jgroups.Channel; -import org.jgroups.ChannelException; -import org.jgroups.JChannel; -import org.jgroups.Message; -import org.jgroups.ReceiverAdapter; - -public class JGroupsTest extends ReceiverAdapter { - - public JGroupsTest() { - try { - JChannel jChannel = new JChannel("udp.xml"); - jChannel.connect("MonPremierGroupe"); - System.out.println("Channel.LOCAL was " + jChannel.getOpt(Channel.LOCAL)); - jChannel.setOpt(Channel.LOCAL, new Boolean(false)); - System.out.println("Channel.LOCAL is now " + jChannel.getOpt(Channel.LOCAL)); - jChannel.setReceiver(this); - jChannel.send(null, null, new String("Hello !")); - } catch (ChannelException e) { - e.printStackTrace(); - } - } - - public static void main(String args[]) { - new JGroupsTest(); - } - - @Override - public void receive(Message msg) { - System.out.println(msg.getObject()); - - } - -} Modified: trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/SimpleDownload.java =================================================================== --- trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/SimpleDownload.java 2010-05-04 17:33:12 UTC (rev 21) +++ trunk/diswork-fs/src/main/java/org/nuiton/disworkfs/SimpleDownload.java 2010-05-04 17:54:32 UTC (rev 22) @@ -27,21 +27,25 @@ this.lookUpService = lookUpService; } - public void initiateDownload() { + public boolean initiateDownload() { lookUpService.lookForFileName(filePath, this); - while (this.fileDescription == null) { + int numberOfSecondsWaited = 0; + + while (this.fileDescription == null && numberOfSecondsWaited <= 10) { // response not yet received, wait again... try { Thread.sleep(1000); log.info("waiting for look-up response"); + numberOfSecondsWaited += 1; } catch (InterruptedException e) { // TODO Auto-generated catch block e.printStackTrace(); } } + return fileDescription != null; }