From 8ca1308914cbcc869a906bc79f3c73616c492eba Mon Sep 17 00:00:00 2001
From: Sofien Haj Chedhli <shajchedli@exoplatform.com>
Date: Fri, 7 Jul 2023 11:44:23 +0100
Subject: [PATCH] fix : Fix news filtering by space with search terms -
 EXO-64778 (#876)

Before this change, when we attempted to filter news by search term and selected space, the space filter was not being applied. This issue was caused by a null pointer exception during the construction of the search news query. This fix addresses this issue
---
 .../org/exoplatform/news/queryBuilder/NewsQueryBuilder.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/services/src/main/java/org/exoplatform/news/queryBuilder/NewsQueryBuilder.java b/services/src/main/java/org/exoplatform/news/queryBuilder/NewsQueryBuilder.java
index 27162741d3..f205a37950 100644
--- a/services/src/main/java/org/exoplatform/news/queryBuilder/NewsQueryBuilder.java
+++ b/services/src/main/java/org/exoplatform/news/queryBuilder/NewsQueryBuilder.java
@@ -55,7 +55,7 @@ public StringBuilder buildQuery(NewsFilter filter) throws Exception {
         if (filter.getSearchText() != null && !filter.getSearchText().equals("")) {
           String escapedQuoteSearchText = filter.getSearchText().replace("'", "''").replace("\"", "\"\"");
           sqlQuery.append("CONTAINS(.,'").append(escapedQuoteSearchText).append("')");
-          if (!filter.getTagNames().isEmpty()){
+          if (filter.getTagNames() != null && !filter.getTagNames().isEmpty()){
             sqlQuery.append(" OR (");
             for (String tagName : filter.getTagNames()) {
               sqlQuery.append(" exo:body LIKE '%#").append(tagName).append("%'");