From b68eecfa79696b72b7242de27de530c4e0112c28 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Sat, 1 Feb 2020 13:13:58 -0500 Subject: [PATCH] avoid NPE, return empty map --- src/main/java/org/cobbzilla/util/http/URIUtil.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/cobbzilla/util/http/URIUtil.java b/src/main/java/org/cobbzilla/util/http/URIUtil.java index 63252dc..90d44e9 100644 --- a/src/main/java/org/cobbzilla/util/http/URIUtil.java +++ b/src/main/java/org/cobbzilla/util/http/URIUtil.java @@ -2,10 +2,7 @@ package org.cobbzilla.util.http; import java.net.URI; import java.net.URISyntaxException; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; +import java.util.*; import static org.cobbzilla.util.daemon.ZillaRuntime.die; import static org.cobbzilla.util.daemon.ZillaRuntime.empty; @@ -75,6 +72,7 @@ public class URIUtil { // adapted from https://stackoverflow.com/a/13592567/1251543 public static Map queryParams(String query) { + if (empty(query)) return Collections.emptyMap(); if (query.contains("?")) query = query.substring(query.indexOf("?")+1); final Map query_pairs = new LinkedHashMap<>(); final String[] pairs = query.split("&");