From: fhanik <fhanik@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 17 Oct 2007 17:51:44 +0000 (+0000)
Subject: Fix property setter for keystore type
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=08d90f3d238da06162251cec03ee0060d653fa8b;p=tomcat7.0

Fix property setter for keystore type


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@585604 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index dc2628fd9..b9d0a69e6 100644
--- a/STATUS
+++ b/STATUS
@@ -52,11 +52,6 @@ PATCHES PROPOSED TO BACKPORT:
   +1: remm, fhanik,funkman, pero
   -1: 
 
-* Fix property setter for keystore type
-  http://issues.apache.org/bugzilla/show_bug.cgi?id=43634
-  +1: fhanik,funkman,remm, pero
-  -1: 
-
 * IcedTea support. Upcoming Linux distributions will package a (working) open source JRE,
   available in /usr. As a result, it could now be possible to use a "/usr/bin/java" binary
   if one is present and expect results. [tested on Fedora 8 test 3]
diff --git a/java/org/apache/coyote/http11/Http11NioProtocol.java b/java/org/apache/coyote/http11/Http11NioProtocol.java
index b9cd041c7..b56081f09 100644
--- a/java/org/apache/coyote/http11/Http11NioProtocol.java
+++ b/java/org/apache/coyote/http11/Http11NioProtocol.java
@@ -558,7 +558,9 @@ public class Http11NioProtocol implements ProtocolHandler, MBeanRegistration
     public String getKeypass() { return getKeystorePass();}
     public String getKeystoreType() { return ep.getKeystoreType();}
     public void setKeystoreType(String s ) { ep.setKeystoreType(s);}
-    
+    public String getKeytype() { return getKeystoreType();}
+    public void setKeytype(String s ) { setKeystoreType(s);}
+
     public void setTruststoreFile(String f){ep.setTruststoreFile(f);}
     public String getTruststoreFile(){return ep.getTruststoreFile();}
     public void setTruststorePass(String p){ep.setTruststorePass(p);}