Merge branch 'master' of github.com:metamx/druid

chinnurtb · May 12, 2014 · c57a18d · c57a18d
2 parents 32eee95 + 4cc2f98
commit c57a18d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/server/src/main/java/io/druid/db/DatabaseSegmentManager.java b/server/src/main/java/io/druid/db/DatabaseSegmentManager.java
@@ -106,7 +106,7 @@ public void start()
       final Duration delay = config.get().getPollDuration().toStandardDuration();
       ScheduledExecutors.scheduleWithFixedDelay(
           exec,
-          delay,
+          new Duration(0),
           delay,
           new Runnable()
           {

diff --git a/server/src/test/java/io/druid/db/DatabaseSegmentManagerTest.java b/server/src/test/java/io/druid/db/DatabaseSegmentManagerTest.java
@@ -106,7 +106,7 @@ public void tearDown() throws Exception
   @Test
   public void testPoll()
   {
-    EasyMock.expect(dbi.withHandle(EasyMock.<HandleCallback>anyObject())).andReturn(testRows);
+    EasyMock.expect(dbi.withHandle(EasyMock.<HandleCallback>anyObject())).andReturn(testRows).times(2);
     EasyMock.replay(dbi);
 
     manager.start();