From f13b2c9423b520856c733aa45a3115c171d7dbff Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Wed, 29 Jan 2020 02:50:02 -0500
Subject: [PATCH] avoid NPE if no query string

---
 .../src/main/java/bubble/resources/account/DevicesResource.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bubble-server/src/main/java/bubble/resources/account/DevicesResource.java b/bubble-server/src/main/java/bubble/resources/account/DevicesResource.java
index ebe46289..b3aa4cdc 100644
--- a/bubble-server/src/main/java/bubble/resources/account/DevicesResource.java
+++ b/bubble-server/src/main/java/bubble/resources/account/DevicesResource.java
@@ -33,7 +33,7 @@ public class DevicesResource extends AccountOwnedResource<Device, DeviceDAO> {
 
     @Override protected List<Device> list(ContainerRequest ctx) {
         final Account caller = userPrincipal(ctx);
-        if (caller.admin() && ctx.getRequestUri().getQuery().contains("all")) {
+        if (caller.admin() && ctx.getRequestUri().getQuery() != null && ctx.getRequestUri().getQuery().contains("all")) {
             return getDao().findAll().stream().filter(Device::initialized).collect(Collectors.toList());
         } else {
             return super.list(ctx).stream().filter(Device::initialized).collect(Collectors.toList());