Attachment 910317 Details for Bug 1108307 – Proposed patch

[patch] Proposed patch

bz-1108307.patch (text/plain), 1.77 KB, created by Emmanuel Hugonnet (ehsavoie) on 2014-06-19 09:54:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Emmanuel Hugonnet (ehsavoie)

Created: 2014-06-19 09:54:10 UTC

Size: 1.77 KB

patch

obsolete

>Index: src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
>===================================================================
>--- src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java	(rÃ©vision 2462)
>+++ src/main/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java	(copie de travail)
>@@ -239,8 +239,13 @@
>             throws IOException {
> 
>         String keystoreFile = (String)attributes.get("keystore");
>-        if (keystoreFile == null)
>-            keystoreFile = defaultKeystoreFile;
>+        if (keystoreFile == null) {
>+            if("Windows-MY".equals(type) ||"Windows-ROOT".equals(type)) {
>+                keystoreFile = "";
>+            } else {
>+                keystoreFile = defaultKeystoreFile;
>+            }
>+        }
> 
>         return getStore(type, provider, keystoreFile, pass);
>     }
>Index: src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java
>===================================================================
>--- src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java	(rÃ©vision 2462)
>+++ src/main/java/org/apache/tomcat/util/net/jsse/NioJSSESocketChannelFactory.java	(copie de travail)
>@@ -372,8 +372,13 @@
> 	protected KeyStore getKeystore(String type, String provider, String pass) throws IOException {
> 
> 		String keystoreFile = (String) attributes.get("keystore");
>-		if (keystoreFile == null)
>-			keystoreFile = defaultKeystoreFile;
>+		if (keystoreFile == null) {
>+                    if("Windows-MY".equals(type) ||"Windows-ROOT".equals(type)) {
>+                        keystoreFile = "";
>+                    } else {
>+                        keystoreFile = defaultKeystoreFile;
>+                    }
>+                }
> 
> 		return getStore(type, provider, keystoreFile, pass);
> 	}

Actions: View | Diff

Attachments on bug 1108307: 910317