From dfe61da0ca8ca3ff071f8bcbe1b76b1eb0ef57e3 Mon Sep 17 00:00:00 2001
From: Kushal Munir < kmunir@ca.ibm.com>
Date: Thu, 18 May 2006 21:56:26 +0000
Subject: [PATCH] Bug 141842: Clear Password action is disabled

---
 .../eclipse/rse/ui/actions/SystemClearAllPasswordsAction.java | 4 ++--
 .../org/eclipse/rse/ui/actions/SystemClearPasswordAction.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemClearAllPasswordsAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemClearAllPasswordsAction.java
index 08b606c4471..65e73194aab 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemClearAllPasswordsAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemClearAllPasswordsAction.java
@@ -64,7 +64,7 @@ public class SystemClearAllPasswordsAction extends SystemBaseAction {
 	            ISubSystem subsystem = subsystems[i];
 	            IConnectorService system = subsystem.getConnectorService();
 	            
-	            anyOk = !system.isConnected() && system.isPasswordCached();
+	            anyOk = !system.isConnected() && system.isPasswordCached(true);
 	            
 	            if (anyOk) 
 	            {
@@ -92,7 +92,7 @@ public class SystemClearAllPasswordsAction extends SystemBaseAction {
         	{
     			IConnectorService system = ss.getConnectorService();
     		
-    			if (system.isPasswordCached())
+    			if (system.isPasswordCached() || system.isPasswordCached(true))
     			{
 	    			// get the user id
 	    			String userId = system.getUserId();
diff --git a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemClearPasswordAction.java b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemClearPasswordAction.java
index 0049bcdb850..6d64c570604 100644
--- a/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemClearPasswordAction.java
+++ b/rse/plugins/org.eclipse.rse.ui/UI/org/eclipse/rse/ui/actions/SystemClearPasswordAction.java
@@ -57,7 +57,7 @@ public class SystemClearPasswordAction extends SystemBaseAction
 	{
 		if (!(obj instanceof ISubSystem) ||
 				((ISubSystem)obj).getConnectorService().isConnected() ||
-				!(((ISubSystem)obj).getConnectorService().isPasswordCached())) {
+				!(((ISubSystem)obj).getConnectorService().isPasswordCached(true))) {
 			return false;
 		}
 		else {