refactoring.

dropwizard/src/main/java/com`example/helloworld/db/WorldDAO.java

@@ -0,0 +1,22 @@
+
+package com.example.helloworld.db;
+
+import org.hibernate.SessionFactory;
+
+import com.example.helloworld.core.World;
+import com.google.common.base.Optional;
+import com.yammer.dropwizard.hibernate.AbstractDAO;
+
+public class WorldDAO
+    extends AbstractDAO<World>
+{
+  public WorldDAO(SessionFactory factory)
+  {
+    super(factory);
+  }
+
+  public Optional<World> findById(Long id)
+  {
+    return Optional.fromNullable(get(id));
+  }
+}

toolset/benchmark/benchmarker.py

@@ -832,11 +832,9 @@ class Benchmarker:
   def __load_results(self):
     try:
       with open(os.path.join(self.latest_results_directory, 'results.json')) as f:
-        results = json.load(f)
+        self.results = json.load(f)
     except (ValueError, IOError):
       pass
-    else:
-      self.results = results
 
   ############################################################
   # __finish