Merge pull request Azure#908 from jianghaolu/master

Azure#622: Shutdown ADAL auth executors
jianghaolu · Apr 1, 2016 · e4ba498 · e4ba498
2 parents 5a6f236 + 711df83
commit e4ba498
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/...entication/src/main/java/com/microsoft/azure/credentials/ApplicationTokenCredentials.java b/...entication/src/main/java/com/microsoft/azure/credentials/ApplicationTokenCredentials.java
@@ -13,6 +13,7 @@
 import com.microsoft.rest.credentials.TokenCredentials;
 
 import java.io.IOException;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 /**
@@ -103,14 +104,17 @@ public void refreshToken() throws IOException {
 
     private void acquireAccessToken() throws IOException {
         String authorityUrl = this.getEnvironment().getAuthenticationEndpoint() + this.getDomain();
-        AuthenticationContext context = new AuthenticationContext(authorityUrl, this.getEnvironment().isValidateAuthority(), Executors.newSingleThreadExecutor());
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        AuthenticationContext context = new AuthenticationContext(authorityUrl, this.getEnvironment().isValidateAuthority(), executor);
         try {
             authenticationResult = context.acquireToken(
                     this.getEnvironment().getTokenAudience(),
                     new ClientCredential(this.getClientId(), this.getSecret()),
                     null).get();
         } catch (Exception e) {
             throw new IOException(e.getMessage(), e);
+        } finally {
+            executor.shutdown();
         }
     }
 }
diff --git a/...nt-authentication/src/main/java/com/microsoft/azure/credentials/UserTokenCredentials.java b/...nt-authentication/src/main/java/com/microsoft/azure/credentials/UserTokenCredentials.java
@@ -13,6 +13,7 @@
 
 import java.io.IOException;
 import java.util.Date;
+import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
 /**
@@ -146,14 +147,17 @@ private void acquireAccessToken() throws IOException {
 
     private void acquireAccessTokenFromRefreshToken() throws IOException {
         String authorityUrl = this.getEnvironment().getAuthenticationEndpoint() + this.getDomain();
-        AuthenticationContext context = new AuthenticationContext(authorityUrl, this.getEnvironment().isValidateAuthority(), Executors.newSingleThreadExecutor());
+        ExecutorService executor = Executors.newSingleThreadExecutor();
+        AuthenticationContext context = new AuthenticationContext(authorityUrl, this.getEnvironment().isValidateAuthority(), executor);
         try {
             authenticationResult = context.acquireTokenByRefreshToken(
                     authenticationResult.getRefreshToken(),
                     this.getClientId(),
                     null, null).get();
         } catch (Exception e) {
             throw new IOException(e.getMessage(), e);
+        } finally {
+            executor.shutdown();
         }
     }
 }