Repository: incubator-stratos Updated Branches: refs/heads/master c6334db79 -> b333a2a7c
Fixing git repository password becoming null issue Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/b333a2a7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/b333a2a7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/b333a2a7 Branch: refs/heads/master Commit: b333a2a7c27ae5ffb542095e0d6cb2293a4c27cf Parents: c6334db Author: Sajith Kariyawasam <[email protected]> Authored: Mon Mar 24 02:05:36 2014 +0530 Committer: Sajith Kariyawasam <[email protected]> Committed: Mon Mar 24 02:05:36 2014 +0530 ---------------------------------------------------------------------- .../org/apache/stratos/cartridge/agent/CartridgeAgent.java | 6 +++++- .../stratos/manager/manager/CartridgeSubscriptionManager.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b333a2a7/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java index 4457024..c738235 100644 --- a/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java +++ b/components/org.apache.stratos.cartridge.agent/src/main/java/org/apache/stratos/cartridge/agent/CartridgeAgent.java @@ -227,7 +227,11 @@ public class CartridgeAgent implements Runnable { } RepositoryInformation repoInformation = new RepositoryInformation(); repoInformation.setRepoUsername(repoUsername); - repoInformation.setRepoPassword(repoPassword); + if(repoPassword == null) { + repoInformation.setRepoPassword(""); + }else { + repoInformation.setRepoPassword(repoPassword); + } repoInformation.setRepoUrl(repoURL); repoInformation.setRepoPath(localRepoPath); repoInformation.setTenantId(tenantId); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/b333a2a7/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java index e4aa282..ad4accc 100644 --- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java +++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/manager/CartridgeSubscriptionManager.java @@ -269,7 +269,7 @@ public class CartridgeSubscriptionManager { if(repositoryPassword != null && !repositoryPassword.isEmpty()) { encryptedRepoPassword = RepoPasswordMgtUtil.encryptPassword(repositoryPassword, subscriptionKey); } else { - encryptedRepoPassword = repositoryPassword; + encryptedRepoPassword = ""; } // Create repository
