You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by kw...@apache.org on 2020/07/03 10:10:42 UTC
[jackrabbit-filevault] branch master updated: JCRVLT-437 fix NPE
when no filter is set
This is an automated email from the ASF dual-hosted git repository.
kwin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
The following commit(s) were added to refs/heads/master by this push:
new 4246fcc JCRVLT-437 fix NPE when no filter is set
4246fcc is described below
commit 4246fcc918d751bb87b80dadaab1432121cbbf84
Author: Konrad Windszus <kw...@apache.org>
AuthorDate: Fri Jul 3 12:10:30 2020 +0200
JCRVLT-437 fix NPE when no filter is set
---
.../main/java/org/apache/jackrabbit/vault/rcp/impl/RcpServlet.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/vault-rcp/src/main/java/org/apache/jackrabbit/vault/rcp/impl/RcpServlet.java b/vault-rcp/src/main/java/org/apache/jackrabbit/vault/rcp/impl/RcpServlet.java
index 0885eba..abb3009 100644
--- a/vault-rcp/src/main/java/org/apache/jackrabbit/vault/rcp/impl/RcpServlet.java
+++ b/vault-rcp/src/main/java/org/apache/jackrabbit/vault/rcp/impl/RcpServlet.java
@@ -285,7 +285,9 @@ public class RcpServlet extends SlingAllMethodsServlet {
w.endArray();
}
} else {
- w.key(RcpServlet.PARAM_FILTER).value(rcpTask.getFilter().getSourceAsString());
+ if (rcpTask.getFilter() != null) {
+ w.key(RcpServlet.PARAM_FILTER).value(rcpTask.getFilter().getSourceAsString());
+ }
}
w.key("status").object();
w.key(RcpServlet.PARAM_STATE).value(rcpTask.getResult().getState().name());