From commits-return-55971-apmail-harmony-commits-archive=harmony.apache.org@harmony.apache.org Sun Sep 07 08:29:23 2008 Return-Path: Delivered-To: apmail-harmony-commits-archive@www.apache.org Received: (qmail 59219 invoked from network); 7 Sep 2008 08:29:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Sep 2008 08:29:23 -0000 Received: (qmail 58919 invoked by uid 500); 7 Sep 2008 08:29:21 -0000 Delivered-To: apmail-harmony-commits-archive@harmony.apache.org Received: (qmail 58904 invoked by uid 500); 7 Sep 2008 08:29:20 -0000 Mailing-List: contact commits-help@harmony.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@harmony.apache.org Delivered-To: mailing list commits@harmony.apache.org Received: (qmail 58895 invoked by uid 99); 7 Sep 2008 08:29:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 07 Sep 2008 01:29:20 -0700 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; Sun, 07 Sep 2008 08:28:31 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 65A9F23889C2; Sun, 7 Sep 2008 01:28:32 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r692786 - /harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java Date: Sun, 07 Sep 2008 08:28:32 -0000 To: commits@harmony.apache.org From: tellison@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080907082832.65A9F23889C2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tellison Date: Sun Sep 7 01:28:31 2008 New Revision: 692786 URL: http://svn.apache.org/viewvc?rev=692786&view=rev Log: Remove try catch block to let internal error escape. Easier to debug actual error than track down anonymous exceptions. Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java Modified: harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java?rev=692786&r1=692785&r2=692786&view=diff ============================================================================== --- harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java (original) +++ harmony/enhanced/classlib/trunk/modules/x-net/src/main/java/org/apache/harmony/xnet/provider/jsse/ServerHandshakeImpl.java Sun Sep 7 01:28:31 2008 @@ -323,31 +323,25 @@ * @param bytes */ public void unwrapSSLv2(byte[] bytes) { + io_stream.append(bytes); + io_stream.mark(); try { - io_stream.append(bytes); - io_stream.mark(); - try { - clientHello = new ClientHello(io_stream); - } catch (IOException e) { - io_stream.reset(); - return; - } - if (nonBlocking) { - delegatedTasks.add(new DelegatedTask( - new PrivilegedExceptionAction(){ - public Object run() throws Exception { - processClientHello(); - return null; + clientHello = new ClientHello(io_stream); + } catch (IOException e) { + io_stream.reset(); + return; + } + if (nonBlocking) { + delegatedTasks.add(new DelegatedTask( + new PrivilegedExceptionAction() { + public Object run() throws Exception { + processClientHello(); + return null; } - }, - this, - AccessController.getContext())); - return; - } - processClientHello(); - } catch (Exception e) { - fatalAlert(AlertProtocol.INTERNAL_ERROR, "INTERNAL ERROR", e); + }, this, AccessController.getContext())); + return; } + processClientHello(); } /**