diff options
| author | Ingo Bauersachs <ingo@jitsi.org> | 2011-12-06 17:42:09 +0000 |
|---|---|---|
| committer | Ingo Bauersachs <ingo@jitsi.org> | 2011-12-06 17:42:09 +0000 |
| commit | 5bbbd6c31a9c4295ee930569393451b3c1870e31 (patch) | |
| tree | 4f8942e056afc520499f34a2c7a38d3fc0299ffd | |
| parent | a1f49f30d22ad6330104cc20e8f8458e5d400354 (diff) | |
| download | jitsi-5bbbd6c31a9c4295ee930569393451b3c1870e31.zip jitsi-5bbbd6c31a9c4295ee930569393451b3c1870e31.tar.gz jitsi-5bbbd6c31a9c4295ee930569393451b3c1870e31.tar.bz2 | |
Remove property-migration code
| -rw-r--r-- | src/net/java/sip/communicator/impl/certificate/CertificateServiceImpl.java | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/net/java/sip/communicator/impl/certificate/CertificateServiceImpl.java b/src/net/java/sip/communicator/impl/certificate/CertificateServiceImpl.java index 38f37ac..ba6d333 100644 --- a/src/net/java/sip/communicator/impl/certificate/CertificateServiceImpl.java +++ b/src/net/java/sip/communicator/impl/certificate/CertificateServiceImpl.java @@ -166,15 +166,6 @@ public class CertificateServiceImpl String tsFile = (String)config.getProperty(PNAME_TRUSTSTORE_FILE);
String tsPassword = credService.loadPassword(PNAME_TRUSTSTORE_PASSWORD);
- //TODO remove this after stable release 4 (rev3593 is r1, 3651 is r2)
- //migrate the misnamed truststore property
- if(tsFile != null && tsFile.equals("Windows-ROOT"))
- {
- tsType = tsFile;
- tsFile = null;
- config.setProperty(PNAME_TRUSTSTORE_TYPE, tsType);
- config.removeProperty(PNAME_TRUSTSTORE_FILE);
- }
//TODO remove this as soon as we ship with JRE 1.7
//remove windows root from x64 on Java < 1.7
if (!(OSUtils.IS_WINDOWS32
@@ -509,7 +500,6 @@ public class CertificateServiceImpl {
try
{
- //TODO: inject our own socket factory to use our own DNS stuff
SSLContext sslContext = SSLContext.getInstance("TLS");
sslContext.init(
keyManagers,
|