svn commit: r1559575 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AbstractEndpoint.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Sun Jan 19 20:02:22 2014
New Revision: 1559575

URL: http://svn.apache.org/r1559575
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=56021
Make it possible to use the Windows-My keystore that requires keystoreFile="" 
to be set on the connector.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1559573

Modified: 
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java?rev=1559575&r1=1559574&r2=1559575&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AbstractEndpoint.java 
Sun Jan 19 20:02:22 2014
@@ -709,6 +709,11 @@ public abstract class AbstractEndpoint {
 
 
     public String adjustRelativePath(String path, String relativeTo) {
+        // Empty or null path can't point to anything useful. The assumption is
+        // that the value is deliberately empty / null so leave it that way.
+        if (path == null || path.length() == 0) {
+            return path;
+        }
         String newPath = path;
         File f = new File(newPath);
         if ( !f.isAbsolute()) {
@@ -807,9 +812,8 @@ public abstract class AbstractEndpoint {
     private String keystoreFile = System.getProperty("user.home")+"/.keystore";
     public String getKeystoreFile() { return keystoreFile;}
     public void setKeystoreFile(String s ) {
-        String file = adjustRelativePath(s,
+        keystoreFile = adjustRelativePath(s,
                 System.getProperty(Constants.CATALINA_BASE_PROP));
-        this.keystoreFile = file;
     }
 
     private String keystorePass = null;
@@ -855,13 +859,8 @@ public abstract class AbstractEndpoint {
     private String truststoreFile = 
System.getProperty("javax.net.ssl.trustStore");
     public String getTruststoreFile() {return truststoreFile;}
     public void setTruststoreFile(String s) {
-        if (s == null) {
-            this.truststoreFile = null;
-        } else {
-            String file = adjustRelativePath(s,
-                    System.getProperty(Constants.CATALINA_BASE_PROP));
-            this.truststoreFile = file;
-        }
+        truststoreFile = adjustRelativePath(s,
+                System.getProperty(Constants.CATALINA_BASE_PROP));
     }
 
     private String truststorePass =

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1559575&r1=1559574&r2=1559575&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Jan 19 20:02:22 2014
@@ -124,6 +124,12 @@
         <bug>55996</bug>: Ensure Async requests timeout correctly when using 
the
         NIO HTTP connector. (markt)
       </fix>
+      <add>
+        <bug>56021</bug>: Make it possible to use the Windows-MY key store with
+        the BIO and NIo connectors for SSL configuration. It requires a
+        <code>keystoreFile=&quot;&quot; 
keystoreType=&quot;Windows-My&quot;</code>
+        to be set on the connector. Based on a patch provided by Asanka. 
(markt)
+      </add>
     </changelog>
   </subsection>
   <subsection name="Jasper">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org