Return-Path: Delivered-To: apmail-activemq-commits-archive@www.apache.org Received: (qmail 23947 invoked from network); 30 Jun 2009 17:54:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 30 Jun 2009 17:54:03 -0000 Received: (qmail 75176 invoked by uid 500); 30 Jun 2009 17:54:14 -0000 Delivered-To: apmail-activemq-commits-archive@activemq.apache.org Received: (qmail 75139 invoked by uid 500); 30 Jun 2009 17:54:14 -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 75130 invoked by uid 99); 30 Jun 2009 17:54:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jun 2009 17:54:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Jun 2009 17:54:12 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 465C82388892; Tue, 30 Jun 2009 17:53:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r789852 - in /activemq/tags/activemq-5.2.0/activemq-core/src/main/java/org/apache/activemq/transport/tcp: ExceededMaximumConnectionsException.java TcpTransportServer.java Date: Tue, 30 Jun 2009 17:53:52 -0000 To: commits@activemq.apache.org From: bsnyder@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090630175352.465C82388892@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bsnyder Date: Tue Jun 30 17:53:51 2009 New Revision: 789852 URL: http://svn.apache.org/viewvc?rev=789852&view=rev Log: Backing out revision 789520. I mistakenly made a commit to the 5.2.0 tag for AMQ-1928 Removed: activemq/tags/activemq-5.2.0/activemq-core/src/main/java/org/apache/activemq/transport/tcp/ExceededMaximumConnectionsException.java Modified: activemq/tags/activemq-5.2.0/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java Modified: activemq/tags/activemq-5.2.0/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java URL: http://svn.apache.org/viewvc/activemq/tags/activemq-5.2.0/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java?rev=789852&r1=789851&r2=789852&view=diff ============================================================================== --- activemq/tags/activemq-5.2.0/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java (original) +++ activemq/tags/activemq-5.2.0/activemq-core/src/main/java/org/apache/activemq/transport/tcp/TcpTransportServer.java Tue Jun 30 17:53:51 2009 @@ -381,10 +381,8 @@ protected final void handleSocket(Socket socket) { try { if (this.currentTransportCount >= this.maximumConnections) { - throw new ExceededMaximumConnectionsException("Exceeded the maximum " + - "number of allowed client connections. See the 'maximumConnections' " + - "property on the TCP transport configuration URI in the ActiveMQ configuration file (e.g., activemq.xml)"); - } else { + + }else { HashMap options = new HashMap(); options.put("maxInactivityDuration", Long .valueOf(maxInactivityDuration));