Merge "Fixes bug where poppy throws a 500 on blank marker"

openstack-archive · Jan 5, 2015 · 825a4e1 · 825a4e1
2 parents 433507a + ba94438
commit 825a4e1
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/poppy/transport/pecan/controllers/v1/services.py b/poppy/transport/pecan/controllers/v1/services.py
@@ -107,7 +107,7 @@ def get_all(self):
             pecan.abort(400, detail=error)
 
         try:
-            if marker:
+            if marker is not None:
                 marker = str(uuid.UUID(marker))
         except ValueError:
             pecan.abort(400, detail="Marker must be a valid UUID")