airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scnakand...@apache.org
Subject airavata git commit: handling NP issues
Date Fri, 24 Jun 2016 17:52:24 GMT
Repository: airavata
Updated Branches:
  refs/heads/develop 79c59566b -> 1ba2e7de8


handling NP issues


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/1ba2e7de
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/1ba2e7de
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/1ba2e7de

Branch: refs/heads/develop
Commit: 1ba2e7de88acb5ab735755a825f44ea98e7c4be1
Parents: 79c5956
Author: scnakandala <supun.nakandala@gmail.com>
Authored: Fri Jun 24 13:52:17 2016 -0400
Committer: scnakandala <supun.nakandala@gmail.com>
Committed: Fri Jun 24 13:52:17 2016 -0400

----------------------------------------------------------------------
 .../credential/store/server/CredentialStoreServerHandler.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/1ba2e7de/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
----------------------------------------------------------------------
diff --git a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
index 7a9c908..095958d 100644
--- a/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
+++ b/modules/credential-store/credential-store-service/src/main/java/org/apache/airavata/credential/store/server/CredentialStoreServerHandler.java
@@ -301,7 +301,7 @@ public class CredentialStoreServerHandler implements CredentialStoreService.Ifac
                 for (Credential credential : allCredentials) {
                     if (credential instanceof org.apache.airavata.credential.store.credential.impl.password.PasswordCredential)
{
                         org.apache.airavata.credential.store.credential.impl.password.PasswordCredential
pwdCredential = (org.apache.airavata.credential.store.credential.impl.password.PasswordCredential)
credential;
-                        pwdCredMap.put(pwdCredential.getToken(),pwdCredential.getDescription());
+                        pwdCredMap.put(pwdCredential.getToken(),pwdCredential.getDescription()
== null ? "" : pwdCredential.getDescription());
                     }
                 }
             }


Mime
View raw message