NEW - bug 369805: certificate authentication with custom keystore fails

behind proxy 
https://bugs.eclipse.org/bugs/show_bug.cgi?id=369805

1 files changed, 11 insertions, 1 deletions

diff --git a/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/RepositoryTestFixture.java b/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/RepositoryTestFixture.java
index 6433a799..d1f916db 100644
--- a/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/RepositoryTestFixture.java
+++ b/org.eclipse.mylyn.commons.sdk.util/src/org/eclipse/mylyn/commons/sdk/util/RepositoryTestFixture.java
@@ -157,12 +157,22 @@ public abstract class RepositoryTestFixture {
 		if (username != null && password != null) {
 			location.setCredentials(AuthenticationType.REPOSITORY, new UserCredentials(username, password));
 		}
-		if (isUseCertificateAuthentication()) {
+		if (isUseCertificateAuthentication() && !forceDefaultKeystore(proxy)) {
 			location.setCredentials(AuthenticationType.CERTIFICATE, CommonTestUtil.getCertificateCredentials());
 		}
 		return location;
 	}
 
+	/**
+	 * Don't set certificate credentials if behind proxy. See bug 369805 for details.
+	 */
+	private boolean forceDefaultKeystore(Proxy proxy) {
+		if (proxy != null && System.getProperty("javax.net.ssl.keyStore") != null) {
+			return true;
+		}
+		return false;
+	}
+
 	public void setUseCertificateAuthentication(boolean useCertificateAuthentication) {
 		this.useCertificateAuthentication = useCertificateAuthentication;
 	}