Main code

albertzaharovits · Jan 31, 2019 · 9c35133 · 9c35133
1 parent ff7620f
commit 9c35133
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/...urity/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java b/...urity/src/main/java/org/elasticsearch/xpack/security/audit/logfile/LoggingAuditTrail.java
@@ -790,8 +790,10 @@ String toQuotedJsonArray(String[] values) {
     private static Optional<String[]> indices(TransportMessage message) {
         if (message instanceof IndicesRequest) {
             final String[] indices = ((IndicesRequest) message).indices();
-            if (indices != null) {
-                return Optional.of(((IndicesRequest) message).indices());
+            if (indices == null || indices.length == 0 || indices[0] == null) {
+                return Optional.empty();
+            } else {
+                return Optional.of(indices);
             }
         }
         return Optional.empty();