Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 7B97D2009D9 for ; Mon, 2 May 2016 20:55:00 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 7A3A21609B0; Mon, 2 May 2016 20:55:00 +0200 (CEST) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C14AE1602C5 for ; Mon, 2 May 2016 20:54:59 +0200 (CEST) Received: (qmail 78567 invoked by uid 500); 2 May 2016 18:54:58 -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 78557 invoked by uid 99); 2 May 2016 18:54:58 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 May 2016 18:54:58 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 397951A0AAF for ; Mon, 2 May 2016 18:54:58 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.799 X-Spam-Level: * X-Spam-Status: No, score=1.799 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.001] autolearn=disabled Received: from mx2-lw-eu.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id Ld5DreHfP0EU for ; Mon, 2 May 2016 18:54:57 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx2-lw-eu.apache.org (ASF Mail Server at mx2-lw-eu.apache.org) with ESMTP id 7472A5F298 for ; Mon, 2 May 2016 18:54:56 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 215C4E009C for ; Mon, 2 May 2016 18:54:55 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 4EBB53A0056 for ; Mon, 2 May 2016 18:54:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1742023 - in /tomcat/trunk/java/org/apache/coyote/http11/upgrade: UpgradeProcessorBase.java UpgradeProcessorExternal.java UpgradeProcessorInternal.java Date: Mon, 02 May 2016 18:54:54 -0000 To: dev@tomcat.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20160502185455.4EBB53A0056@svn01-us-west.apache.org> archived-at: Mon, 02 May 2016 18:55:00 -0000 Author: markt Date: Mon May 2 18:54:49 2016 New Revision: 1742023 URL: http://svn.apache.org/viewvc?rev=1742023&view=rev Log: Clean-up unused code Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java?rev=1742023&r1=1742022&r2=1742023&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorBase.java Mon May 2 18:54:49 2016 @@ -33,8 +33,7 @@ public abstract class UpgradeProcessorBa private final UpgradeToken upgradeToken; - public UpgradeProcessorBase(SocketWrapperBase wrapper, - UpgradeToken upgradeToken) { + public UpgradeProcessorBase(UpgradeToken upgradeToken) { this.upgradeToken = upgradeToken; } Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java?rev=1742023&r1=1742022&r2=1742023&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorExternal.java Mon May 2 18:54:49 2016 @@ -41,7 +41,7 @@ public class UpgradeProcessorExternal ex public UpgradeProcessorExternal(SocketWrapperBase wrapper, UpgradeToken upgradeToken) { - super(wrapper, upgradeToken); + super(upgradeToken); this.upgradeServletInputStream = new UpgradeServletInputStream(this, wrapper); this.upgradeServletOutputStream = new UpgradeServletOutputStream(this, wrapper); Modified: tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java?rev=1742023&r1=1742022&r2=1742023&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java (original) +++ tomcat/trunk/java/org/apache/coyote/http11/upgrade/UpgradeProcessorInternal.java Mon May 2 18:54:49 2016 @@ -37,7 +37,7 @@ public class UpgradeProcessorInternal ex public UpgradeProcessorInternal(SocketWrapperBase wrapper, UpgradeToken upgradeToken) { - super(wrapper, upgradeToken); + super(upgradeToken); this.internalHttpUpgradeHandler = (InternalHttpUpgradeHandler) upgradeToken.getHttpUpgradeHandler(); /* * Leave timeouts in the hands of the upgraded protocol. --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org