Mercurial > hg > release > thermostat-0.6

changeset 876:948273e69e5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix ordering problem with queue storage. Reviewed-by: vanaltj Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-December/004881.html
author Roman Kennke <rkennke@redhat.com>
date Tue, 18 Dec 2012 22:02:42 +0100
parents 29f815f1bbed
children ec6d1e7c6fed
files storage/core/src/main/java/com/redhat/thermostat/storage/core/QueuedStorage.java storage/core/src/test/java/com/redhat/thermostat/storage/core/QueuedStorageTest.java
diffstat 2 files changed, 2 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/storage/core/src/main/java/com/redhat/thermostat/storage/core/QueuedStorage.java	Tue Dec 18 19:57:03 2012 +0100
+++ b/storage/core/src/main/java/com/redhat/thermostat/storage/core/QueuedStorage.java	Tue Dec 18 22:02:42 2012 +0100
@@ -204,16 +204,7 @@
 
     @Override
     public void registerCategory(final Category category) {
-
-        executor.execute(new Runnable() {
-            
-            @Override
-            public void run() {
-                delegate.registerCategory(category);
-            }
-
-        });
-
+        delegate.registerCategory(category);
     }
 
     @Override
--- a/storage/core/src/test/java/com/redhat/thermostat/storage/core/QueuedStorageTest.java	Tue Dec 18 19:57:03 2012 +0100
+++ b/storage/core/src/test/java/com/redhat/thermostat/storage/core/QueuedStorageTest.java	Tue Dec 18 22:02:42 2012 +0100
@@ -384,11 +384,9 @@
 
         queuedStorage.registerCategory(category);
 
-        Runnable task = executor.getTask();
-        verifyZeroInteractions(delegateStorage);
-        task.run();
         verify(delegateStorage).registerCategory(category);
 
+        assertNull(executor.getTask());
         assertNull(fileExecutor.getTask());
     }