From b862db93d03237658fbca32779259b96a424a764 Mon Sep 17 00:00:00 2001
From: Ryan Ernst <ryan@iernst.net>
Date: Mon, 11 Jul 2016 08:38:12 -0700
Subject: [PATCH] Ensure CryptoService is not null for node only services

Original commit: elastic/x-pack-elasticsearch@b17e3620b56399050691f623b8cb7cba9534d85b
---
 .../xpack/security/action/filter/SecurityActionFilter.java      | 2 +-
 .../xpack/security/authc/InternalAuthenticationService.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilter.java b/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilter.java
index 4a350746c64..6adde44d6dc 100644
--- a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilter.java
+++ b/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/action/filter/SecurityActionFilter.java
@@ -60,7 +60,7 @@ public class SecurityActionFilter extends AbstractComponent implements ActionFil
 
     @Inject
     public SecurityActionFilter(Settings settings, AuthenticationService authcService, AuthorizationService authzService,
-                                @Nullable CryptoService cryptoService, AuditTrail auditTrail, SecurityLicenseState licenseState,
+                                CryptoService cryptoService, AuditTrail auditTrail, SecurityLicenseState licenseState,
                                 SecurityActionMapper actionMapper, Set<RequestInterceptor> requestInterceptors, ThreadPool threadPool,
                                 SecurityContext securityContext) {
         super(settings);
diff --git a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/InternalAuthenticationService.java b/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/InternalAuthenticationService.java
index e52ba3a0642..a18f50b9747 100644
--- a/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/InternalAuthenticationService.java
+++ b/elasticsearch/x-pack/security/src/main/java/org/elasticsearch/xpack/security/authc/InternalAuthenticationService.java
@@ -53,7 +53,7 @@ public class InternalAuthenticationService extends AbstractComponent implements
     private final boolean runAsEnabled;
 
     @Inject
-    public InternalAuthenticationService(Settings settings, Realms realms, AuditTrail auditTrail, @Nullable CryptoService cryptoService,
+    public InternalAuthenticationService(Settings settings, Realms realms, AuditTrail auditTrail, CryptoService cryptoService,
                                          AuthenticationFailureHandler failureHandler, ThreadPool threadPool, RestController controller) {
         super(settings);
         this.nodeName = Node.NODE_NAME_SETTING.get(settings);