You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2014/04/27 00:02:18 UTC
git commit: JCLOUDS-549: Fix NPE in LoginCredentials.toString
Repository: jclouds
Updated Branches:
refs/heads/1.7.x 4a729562d -> 25c37fc8c
JCLOUDS-549: Fix NPE in LoginCredentials.toString
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/25c37fc8
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/25c37fc8
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/25c37fc8
Branch: refs/heads/1.7.x
Commit: 25c37fc8ca360a98f4943f1363d093dd1424e597
Parents: 4a72956
Author: Aled Sage <al...@gmail.com>
Authored: Thu Apr 24 10:56:44 2014 +0100
Committer: Andrew Phillips <an...@apache.org>
Committed: Sat Apr 26 18:01:43 2014 -0400
----------------------------------------------------------------------
.../main/java/org/jclouds/domain/LoginCredentials.java | 5 +++--
.../java/org/jclouds/domain/LoginCredentialsTest.java | 12 ++++++++++++
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/25c37fc8/core/src/main/java/org/jclouds/domain/LoginCredentials.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/domain/LoginCredentials.java b/core/src/main/java/org/jclouds/domain/LoginCredentials.java
index d94acd7..a77c9f0 100644
--- a/core/src/main/java/org/jclouds/domain/LoginCredentials.java
+++ b/core/src/main/java/org/jclouds/domain/LoginCredentials.java
@@ -207,7 +207,8 @@ public class LoginCredentials extends Credentials {
@Override
public String toString() {
- return "[user=" + getUser() + ", passwordPresent=" + password.isPresent() + ", privateKeyPresent="
- + privateKey.isPresent() + ", shouldAuthenticateSudo=" + authenticateSudo + "]";
+ return "[user=" + getUser() + ", passwordPresent=" + (password != null ? password.isPresent() : false)
+ + ", privateKeyPresent=" + (privateKey != null ? privateKey.isPresent() : false)
+ + ", shouldAuthenticateSudo=" + authenticateSudo + "]";
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/25c37fc8/core/src/test/java/org/jclouds/domain/LoginCredentialsTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/domain/LoginCredentialsTest.java b/core/src/test/java/org/jclouds/domain/LoginCredentialsTest.java
index 7bb2810..75c380b 100644
--- a/core/src/test/java/org/jclouds/domain/LoginCredentialsTest.java
+++ b/core/src/test/java/org/jclouds/domain/LoginCredentialsTest.java
@@ -17,6 +17,7 @@
package org.jclouds.domain;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
import org.testng.annotations.Test;
@@ -51,4 +52,15 @@ public class LoginCredentialsTest {
assertEquals(toTest.getOptionalPassword(), Optional.of("password"));
assertEquals(toTest.getOptionalPrivateKey(), Optional.of("key"));
}
+
+ public void testToStringWhenNullPasswordAndKey() {
+ LoginCredentials toTest = LoginCredentials.builder().user("myuser").build();
+ // also verifies that toString() does not blow up with an NPE
+ assertNotNull(toTest.toString());
+ }
+
+ public void testToString() {
+ LoginCredentials toTest = LoginCredentials.builder().user("myuser").password("password").privateKey("key").build();
+ assertNotNull(toTest.toString());
+ }
}