[zeppelin] branch master updated: [HOTFIX] [ZEPPELIN-4356] revert ShiroAuthenticationService to Singleton

[pr...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

prabhjyotsingh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/master by this push:
     new 42d81f8  [HOTFIX] [ZEPPELIN-4356] revert ShiroAuthenticationService to Singleton
42d81f8 is described below

commit 42d81f87681bdc506785716f8875d13c8e21ec86
Author: Prabhjyot Singh <pr...@gmail.com>
AuthorDate: Wed Oct 9 16:43:02 2019 +0530

    [HOTFIX] [ZEPPELIN-4356] revert ShiroAuthenticationService to Singleton
    
    ### What is this PR for?
    This is caused due to the merge of #3468.
    Before merging this I tried this on my local, but guess I had some cache jar causing it to work, however it was broken.
    
    ### What type of PR is it?
    [Hot Fix]
    
    ### How should this be tested?
    * Zeppelin should work with authentication enabled
    
    ### Screenshots (if appropriate)
    N/A
    
    ### Questions:
    * Does the licenses files need update? no
    * Is there breaking changes for older versions? no
    * Does this needs documentation? no
    
    Author: Prabhjyot Singh <pr...@gmail.com>
    
    Closes #3479 from prabhjyotsingh/hotfix/ZEPPELIN-4356 and squashes the following commits:
    
    85fa2d291 [Prabhjyot Singh] [ZEPPELIN-4356] revert ShiroAuthenticationService to Singleton
    
    Change-Id: I3511d4ba16969d37c6c8739995bdd1dd9e7b3e65
---
 .../src/main/java/org/apache/zeppelin/server/ZeppelinServer.java        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
index e8bef11..1a2a040 100644
--- a/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
+++ b/zeppelin-server/src/main/java/org/apache/zeppelin/server/ZeppelinServer.java
@@ -154,7 +154,7 @@ public class ZeppelinServer extends ResourceConfig {
             bindAsContract(AuthorizationService.class).to(Singleton.class);
             // TODO(jl): Will make it more beautiful
             if (!StringUtils.isBlank(conf.getShiroPath())) {
-              bind(ShiroAuthenticationService.class).to(AuthenticationService.class).in(Immediate.class);
+              bind(ShiroAuthenticationService.class).to(AuthenticationService.class).in(Singleton.class);
             } else {
               // TODO(jl): Will be added more type
               bind(NoAuthenticationService.class).to(AuthenticationService.class).in(Singleton.class);