Attachment 109050 Details for Bug 232982 – Fix v02

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Fix v02

clipboard.txt (text/plain), 5.10 KB, created by Tomasz Zarna

on 2008-08-04 05:21:05 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tomasz Zarna

Created: 2008-08-04 05:21:05 EDT

Size: 5.10 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.team.cvs.core
>Index: src/org/eclipse/team/internal/ccvs/core/ICVSRepositoryLocation.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/ICVSRepositoryLocation.java,v
>retrieving revision 1.26
>diff -u -r1.26 ICVSRepositoryLocation.java
>--- src/org/eclipse/team/internal/ccvs/core/ICVSRepositoryLocation.java	15 Dec 2005 22:19:54 -0000	1.26
>+++ src/org/eclipse/team/internal/ccvs/core/ICVSRepositoryLocation.java	4 Aug 2008 09:18:50 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2005 IBM Corporation and others.
>+ * Copyright (c) 2000, 2008 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -19,10 +19,10 @@
>  * the repository location string for use by connection methods
>  * and the user authenticator.
>  * 
>- * It is not intended to implemented by clients.
>- * 
>  * @see IUserAuthenticator
>  * @see IConnectionMethod
>+ * 
>+ * @noimplement It is not intended to implemented by clients.
>  */
> public interface ICVSRepositoryLocation  extends IAdaptable {
> 
>@@ -103,7 +103,7 @@
> 	public IUserInfo getUserInfo(boolean allowModificationOfUsername);	
> 	
> 	/**
>-	 * Flush any cahced user information related to the repository location
>+	 * Flush any cached user information related to the repository location
> 	 */
> 	public void flushUserInfo();
> 	
>Index: src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java,v
>retrieving revision 1.107
>diff -u -r1.107 CVSRepositoryLocation.java
>--- src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java	28 May 2008 17:58:40 -0000	1.107
>+++ src/org/eclipse/team/internal/ccvs/core/connection/CVSRepositoryLocation.java	4 Aug 2008 09:18:50 -0000
>@@ -141,7 +141,7 @@
> 	private boolean previousAuthenticationFailed = false;
> 	
> 	/**
>-	 * Return the preferences node whose child nodes are teh know repositories
>+	 * Return the preferences node whose child nodes are the know repositories
> 	 * @return a preferences node
> 	 */
> 	public static Preferences getParentPreferences() {
>@@ -149,7 +149,7 @@
> 	}
> 	
> 	/**
>-	 * Return a preferences node that contains suitabel defaults for a
>+	 * Return a preferences node that contains suitable defaults for a
> 	 * repository location.
> 	 * @return  a preferences node
> 	 */
>@@ -548,11 +548,11 @@
> 	
> 	/*
> 	 * Dispose of the receiver by clearing any cached authorization information.
>-	 * This method shold only be invoked when the corresponding adapter is shut
>+	 * This method should only be invoked when the corresponding adapter is shut
> 	 * down or a connection is being validated.
> 	 */
> 	public void dispose() {
>-		flushCache();
>+		removeNode();
> 		try {
> 			if (hasPreferences()) {
> 				internalGetPreferences().removeNode();
>@@ -564,14 +564,17 @@
> 	}
> 	
> 	/*
>-	 * Flush the keyring entry associated with the receiver
>+	 * Clear and flush the keyring entry associated with the receiver
> 	 */
>-	private void flushCache() {
>+	private void removeNode() {
> 		ISecurePreferences node = getCVSNode();
> 		if (node == null)
> 			return;
> 		try {
>-			node.flush();
>+			node.clear();
>+			node.flush(); // save immediately
>+		} catch (IllegalStateException e) {
>+			CVSProviderPlugin.log(IStatus.ERROR, e.getMessage(), e);
> 		} catch (IOException e) {
> 			CVSProviderPlugin.log(IStatus.ERROR, e.getMessage(), e);
> 		}
>@@ -889,8 +892,8 @@
>     }
> 
>     /*
>-     * The connection was sucessfully made. Update the cached
>-     * repository location if it is a differnet instance than
>+     * The connection was successfully made. Update the cached
>+     * repository location if it is a different instance than
>      * this location.
>      */
>     private void updateCachedLocation() {
>@@ -963,6 +966,9 @@
> 		// We set the password here but it will be cleared 
> 		// if the user info is cached using updateCache()
> 		this.password = password;
>+		// The password has been changed, reset the flag, so we won't 
>+		// prompt before attempting to connect
>+		previousAuthenticationFailed = false;
> 	}
> 	
> 	/*
>@@ -980,10 +986,13 @@
> 	
> 	public void setAllowCaching(boolean value) {
> 		allowCaching = value;
>-        if (allowCaching)
>+        if (allowCaching) {
>             updateCache();
>-        else
>-            flushCache();
>+        } else {
>+        	if (password == null)
>+        		password = retrievePassword();
>+            removeNode();
>+        }
> 	}
> 	
> 	public void updateCache() {
>@@ -1082,7 +1091,7 @@
> 	 * @see ICVSRepositoryLocation#flushUserInfo()
> 	 */
> 	public void flushUserInfo() {
>-		flushCache();
>+		removeNode();
> 	}
> 	
> 	/*

Actions: View | Diff

Attachments on bug 232982: 108741 | 108742 | 109050