You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/10/13 18:31:43 UTC
git commit: adding alternate names for AWS creds
Repository: incubator-usergrid
Updated Branches:
refs/heads/two-dot-o df6fa47e7 -> a1b77e9e4
adding alternate names for AWS creds
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/a1b77e9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/a1b77e9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/a1b77e9e
Branch: refs/heads/two-dot-o
Commit: a1b77e9e450611e84cec2434b155e7502da762f3
Parents: df6fa47
Author: Shawn Feldman <sf...@apache.org>
Authored: Mon Oct 13 10:31:27 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Mon Oct 13 10:31:27 2014 -0600
----------------------------------------------------------------------
.../usergrid/persistence/queue/impl/SQSQueueManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/a1b77e9e/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java
index 3d342bb..ee45b25 100644
--- a/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java
+++ b/stack/corepersistence/queue/src/main/java/org/apache/usergrid/persistence/queue/impl/SQSQueueManagerImpl.java
@@ -222,7 +222,7 @@ public class SQSQueueManagerImpl implements QueueManager {
public String getAWSAccessKeyId() {
String accessKey = System.getProperty(SDKGlobalConfiguration.ACCESS_KEY_ENV_VAR);
if(accessKey == null){
- System.getProperty(SDKGlobalConfiguration.ALTERNATE_ACCESS_KEY_ENV_VAR);
+ accessKey = System.getProperty(SDKGlobalConfiguration.ALTERNATE_ACCESS_KEY_ENV_VAR);
}
return StringUtils.trim(accessKey);
}
@@ -231,7 +231,7 @@ public class SQSQueueManagerImpl implements QueueManager {
public String getAWSSecretKey() {
String secret = System.getProperty(SDKGlobalConfiguration.SECRET_KEY_ENV_VAR);
if(secret==null){
- System.getProperty(SDKGlobalConfiguration.ALTERNATE_SECRET_KEY_ENV_VAR);
+ secret = System.getProperty(SDKGlobalConfiguration.ALTERNATE_SECRET_KEY_ENV_VAR);
}
return StringUtils.trim(secret);
}