You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/02/20 10:22:16 UTC

[incubator-dlab] branch EPMCDLAB-1186 updated: DLAB-1186 fixed problem with iam endpoint

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

bhliva pushed a commit to branch EPMCDLAB-1186
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/EPMCDLAB-1186 by this push:
     new de1892e  DLAB-1186 fixed problem with iam endpoint
de1892e is described below

commit de1892e69a7f89a59b2210e9da677fb142eacdf6
Author: bhliva <bo...@epam.com>
AuthorDate: Wed Feb 20 12:21:11 2019 +0200

    DLAB-1186 fixed problem with iam endpoint
---
 .../src/main/java/com/epam/dlab/auth/aws/dao/AwsUserDAOImpl.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/services/security-aws/src/main/java/com/epam/dlab/auth/aws/dao/AwsUserDAOImpl.java b/services/security-aws/src/main/java/com/epam/dlab/auth/aws/dao/AwsUserDAOImpl.java
index bc3fa65..eaeac71 100644
--- a/services/security-aws/src/main/java/com/epam/dlab/auth/aws/dao/AwsUserDAOImpl.java
+++ b/services/security-aws/src/main/java/com/epam/dlab/auth/aws/dao/AwsUserDAOImpl.java
@@ -38,7 +38,7 @@ public class AwsUserDAOImpl implements AwsUserDAO {
 
 	private final String endpoint;
 	private final String region;
-	private volatile AmazonIdentityManagement aim;
+	private AmazonIdentityManagement aim;
 
 	@Inject
 	public AwsUserDAOImpl(AWSCredentials credentials,
@@ -89,10 +89,10 @@ public class AwsUserDAOImpl implements AwsUserDAO {
 	private AmazonIdentityManagementClient getClient(AWSCredentials credentials) {
 		final AmazonIdentityManagementClient client =
 				new AmazonIdentityManagementClient(credentials);
-		Optional.ofNullable(endpoint)
-				.ifPresent(client::setEndpoint);
 		Optional.ofNullable(region)
 				.ifPresent(r -> client.setRegion(Region.getRegion(Regions.fromName(r))));
+		Optional.ofNullable(endpoint)
+				.ifPresent(client::setEndpoint);
 		return client;
 	}
 }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org