You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jg...@apache.org on 2015/07/08 19:40:44 UTC
svn commit: r1689924 - in
/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk: ./
src/main/csharp/Transport/Tcp/SslTransport.cs
Author: jgomes
Date: Wed Jul 8 17:40:43 2015
New Revision: 1689924
URL: http://svn.apache.org/r1689924
Log:
Merged revision(s) 1689923 from activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.7.x:
Applied patch from Enrique Garcia to copy the 509 certificates to internal list. Thanks, Enrique!
Fixes [AMQNET-500]. (See https://issues.apache.org/jira/browse/AMQNET-500)
Modified:
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/ (props changed)
activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/SslTransport.cs
Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 8 17:40:43 2015
@@ -1,3 +1,4 @@
/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.5.x:1082291,1135831,1137081,1171843,1171874,1177390,1177395,1186568,1187123,1238881,1293360,1294890,1295257,1311395,1312026,1374469,1375295,1376782
+/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.7.x:1689923
/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.0.0:692591,693525
/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/tags/1.1.0:788230,788233,790183
Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/SslTransport.cs
URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/SslTransport.cs?rev=1689924&r1=1689923&r2=1689924&view=diff
==============================================================================
--- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/SslTransport.cs (original)
+++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/SslTransport.cs Wed Jul 8 17:40:43 2015
@@ -314,7 +314,9 @@ namespace Apache.NMS.ActiveMQ.Transport.
X509Store store = new X509Store(name, location);
store.Open(OpenFlags.ReadOnly);
- collection = store.Certificates;
+ X509Certificate2[] certificates = new X509Certificate2[store.Certificates.Count];
+ store.Certificates.CopyTo(certificates, 0);
+ collection.AddRange(certificates);
store.Close();
}