A more robust ntp provider.

Sets a timeout on the ntp client so it's udp ping pong doesn't block
indefinitely. This was picked up via the failing test, refer to #205.

Author: stonier

rosjava/src/main/java/org/ros/time/NtpTimeProvider.java

@@ -63,19 +63,27 @@ public NtpTimeProvider(InetAddress host, ScheduledExecutorService scheduledExecu
     this.scheduledExecutorService = scheduledExecutorService;
     wallTimeProvider = new WallTimeProvider();
     ntpClient = new NTPUDPClient();
+    ntpClient.setDefaultTimeout(500); // timeout to 500ms
     offset = 0;
     scheduledFuture = null;
   }
 
   /**
    * Update the current time offset from the configured NTP host.
    * 
-   * @throws IOException
+   * @throws IOException : if ntpClient.getTime() fails too often.
    */
   public void updateTime() throws IOException {
     List<Long> offsets = Lists.newArrayList();
+    int failures = 0;
     for (int i = 0; i < SAMPLE_SIZE; i++) {
-      offsets.add(computeOffset());
+      try { 
+    	  offsets.add(computeOffset());
+      } catch (IOException e) {
+    	  if ( ++failures > SAMPLE_SIZE/2 ) {
+    		  throw e;
+    	  }
+      }
     }
     offset = CollectionMath.median(offsets);
     log.info(String.format("NTP time offset: %d ms", offset));

rosjava/src/test/java/org/ros/time/NtpTimeProviderTest.java

@@ -45,15 +45,14 @@ public void testNtpUbuntuCom() throws InterruptedException {
     nodeMainExecutor.execute(new AbstractNodeMain() {
       @Override
       public GraphName getDefaultNodeName() {
-        return GraphName.of("node");
+        return GraphName.of("ntp_time_provider");
       }
 
       @Override
       public void onStart(ConnectedNode connectedNode) {
         try {
           ntpTimeProvider.updateTime();
         } catch (IOException e) {
-          System.out.println("Dude");
           // Ignored. This is only a sanity check.
         }
         ntpTimeProvider.getCurrentTime();
@@ -62,6 +61,8 @@ public void onStart(ConnectedNode connectedNode) {
         latch.countDown();
       }
     }, nodeConfiguration);
-    assertTrue(latch.await(1, TimeUnit.SECONDS));
+    boolean result = latch.await(10, TimeUnit.SECONDS);
+    //System.out.println("Latch waiting : " + latch.getCount() + " " + result + " [" + System.currentTimeMillis() + "]");
+    assertTrue(result);
   }
 }