Return-Path: X-Original-To: apmail-activemq-commits-archive@www.apache.org Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id A32EB184D9 for ; Wed, 8 Jul 2015 19:45:40 +0000 (UTC) Received: (qmail 69585 invoked by uid 500); 8 Jul 2015 19:45:40 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 69546 invoked by uid 500); 8 Jul 2015 19:45:40 -0000 Mailing-List: contact commits-help@activemq.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@activemq.apache.org Delivered-To: mailing list commits@activemq.apache.org Received: (qmail 69537 invoked by uid 99); 8 Jul 2015 19:45:40 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 08 Jul 2015 19:45:40 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 5E752AC0596 for ; Wed, 8 Jul 2015 19:45:40 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1689949 - in /activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk: ./ src/main/csharp/Transport/Tcp/TcpTransportFactory.cs Date: Wed, 08 Jul 2015 19:45:40 -0000 To: commits@activemq.apache.org From: jgomes@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150708194540.5E752AC0596@hades.apache.org> Author: jgomes Date: Wed Jul 8 19:45:40 2015 New Revision: 1689949 URL: http://svn.apache.org/r1689949 Log: Merged revision(s) 1689948 from activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.7.x: Set the socket exception error code to RTSSL_HANDSHAKE_FAILURE. Fixes [AMQNET-502]. (See https://issues.apache.org/jira/browse/AMQNET-502) Modified: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/ (props changed) activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs Propchange: activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jul 8 19:45:40 2015 @@ -1,4 +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,1689927 +/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/branches/1.7.x:1689923,1689927,1689948 /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/TcpTransportFactory.cs URL: http://svn.apache.org/viewvc/activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs?rev=1689949&r1=1689948&r2=1689949&view=diff ============================================================================== --- activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs (original) +++ activemq/activemq-dotnet/Apache.NMS.ActiveMQ/trunk/src/main/csharp/Transport/Tcp/TcpTransportFactory.cs Wed Jul 8 19:45:40 2015 @@ -372,7 +372,8 @@ namespace Apache.NMS.ActiveMQ.Transport. if(null == socket) { - throw new SocketException(); + const int RTSSL_HANDSHAKE_FAILURE = -2; + throw new SocketException(RTSSL_HANDSHAKE_FAILURE); } } catch(Exception ex)