From fa73991b4dcddd7a912b64d927224bc5e8b04dd1 Mon Sep 17 00:00:00 2001
From: Philip Durbin <philip_durbin@harvard.edu>
Date: Thu, 22 Oct 2015 12:40:43 -0400
Subject: [PATCH] avoid putting "null" in q param #1338

---
 .../harvard/iq/dataverse/search/SearchIncludeFragment.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java
index e9c9a9aea1f..1f404bd8808 100644
--- a/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java
+++ b/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java
@@ -175,7 +175,12 @@ public String searchRedirect(String dataverseRedirectPage) {
         dataverseRedirectPage = StringUtils.isBlank(dataverseRedirectPage) ? "dataverse.xhtml" : dataverseRedirectPage;
         String optionalDataverseScope = "&alias=" + dataverse.getAlias();
 
-        return dataverseRedirectPage + "?faces-redirect=true&q=" + query + optionalDataverseScope;
+        String qParam = "";
+        if (query != null) {
+            qParam = "&q=" + query;
+        }
+
+        return dataverseRedirectPage + "?faces-redirect=true&q=" + qParam + optionalDataverseScope;
 
     }