Return-Path: X-Original-To: apmail-tomcat-dev-archive@www.apache.org Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 65BCAD29B for ; Mon, 28 Jan 2013 22:42:32 +0000 (UTC) Received: (qmail 82227 invoked by uid 500); 28 Jan 2013 22:42:31 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 82148 invoked by uid 500); 28 Jan 2013 22:42:31 -0000 Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Tomcat Developers List" Delivered-To: mailing list dev@tomcat.apache.org Received: (qmail 82139 invoked by uid 99); 28 Jan 2013 22:42:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Jan 2013 22:42:31 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Mon, 28 Jan 2013 22:42:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7CAB6238897F for ; Mon, 28 Jan 2013 22:42:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1439678 - /tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Date: Mon, 28 Jan 2013 22:42:09 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130128224209.7CAB6238897F@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Mon Jan 28 22:42:09 2013 New Revision: 1439678 URL: http://svn.apache.org/viewvc?rev=1439678&view=rev Log: Handle session close higher up the call stack Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1439678&r1=1439677&r2=1439678&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Mon Jan 28 22:42:09 2013 @@ -497,8 +497,7 @@ public abstract class WsFrameBase { sm.getString("wsFrame.bufferToSmall", Integer.valueOf(inputBuffer.length), Long.valueOf(payloadLength))); - wsSession.close(cr); - throw new IOException(cr.getReasonPhrase()); + throw new WsIOException(cr); } makeRoom(); } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org