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 632BFC839 for ; Mon, 24 Jun 2013 16:24:47 +0000 (UTC) Received: (qmail 46332 invoked by uid 500); 24 Jun 2013 16:24:47 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 45769 invoked by uid 500); 24 Jun 2013 16:24:43 -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 45760 invoked by uid 99); 24 Jun 2013 16:24:42 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Jun 2013 16:24:42 +0000 X-ASF-Spam-Status: No, hits=0.0 required=5.0 tests=RCVD_IN_DNSWL_NONE X-Spam-Check-By: apache.org Received-SPF: error (nike.apache.org: local policy) Received: from [76.96.62.96] (HELO qmta09.westchester.pa.mail.comcast.net) (76.96.62.96) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Jun 2013 16:24:34 +0000 Received: from omta13.westchester.pa.mail.comcast.net ([76.96.62.52]) by qmta09.westchester.pa.mail.comcast.net with comcast id sD1T1l00317dt5G59GPt4i; Mon, 24 Jun 2013 16:23:53 +0000 Received: from Christophers-MacBook-Pro.local ([69.143.106.98]) by omta13.westchester.pa.mail.comcast.net with comcast id sGPt1l00127QCxh3ZGPtgP; Mon, 24 Jun 2013 16:23:53 +0000 Message-ID: <51C87298.7010009@christopherschultz.net> Date: Mon, 24 Jun 2013 12:23:52 -0400 From: Christopher Schultz User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.8; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: Tomcat Developers List Subject: Re: svn commit: r1496061 - in /tomcat/trunk: java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/config/listeners.xml References: <20130624140625.092062388906@eris.apache.org> In-Reply-To: <20130624140625.092062388906@eris.apache.org> X-Enigmail-Version: 1.5.1 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="----enig2AGDXJFLGXPFXTJVTHGJM" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net; s=q20121106; t=1372091033; bh=3/y587lxCPJDy/p4BaoLCrZKmBj5PI+a1VVjrH+iZ8s=; h=Received:Received:Message-ID:Date:From:MIME-Version:To:Subject: Content-Type; b=YVkek13bWd2sUMt7JsRpE0CgQonQyFYpi+cNSTj1kQPFuy1kGjHAM1+0d4OqTRlTa 9MFgH7voJIr4vo/2RMvI58/C2nTLN8HLv/3gFlhxVJc3TexrE8ZKgoZyr4iVpZcSpy GVQhe0FZintV5tEeLzI/VXCptMqGisbepkBsKzoyRu+WwgHB3VbymokxkadEKHuPFp JX/Vz1lb3uXru2jXjo1EMxplPsRXUOufUEdE1o1TpnLbaC3Cw9ZRoBpcbFXIQlkfRk 88BG6thRDDP18pF6DWM9nItvz12n60vlFww1UmJSLzSUsIiC7L/HoGsEawR3Kdl7mQ qnP/zcmfmLXig== X-Virus-Checked: Checked by ClamAV on apache.org ------enig2AGDXJFLGXPFXTJVTHGJM Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Mark, On 6/24/13 10:06 AM, markt@apache.org wrote: > Author: markt > Date: Mon Jun 24 14:06:24 2013 > New Revision: 1496061 >=20 > URL: http://svn.apache.org/r1496061 > Log: > Changes to java.beans.Introspector#flushCaches() mean that AppContext p= rotection is not required from 1.7.0_02 onwards. > Changes to AppContext meant the memory leak protection required a graph= ical environment from 1.7.0_25 onwards. >=20 > Modified: > tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionL= istener.java > tomcat/trunk/webapps/docs/config/listeners.xml >=20 > Modified: tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreve= ntionListener.java > URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina= /core/JreMemoryLeakPreventionListener.java?rev=3D1496061&r1=3D1496060&r2=3D= 1496061&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionL= istener.java (original) > +++ tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionL= istener.java Mon Jun 24 14:06:24 2013 > @@ -59,12 +59,30 @@ public class JreMemoryLeakPreventionList > private static final StringManager sm =3D > StringManager.getManager(Constants.Package); > =20 > + private static final boolean IS_JAVA_7_OR_LATER; > + > + static { > + boolean isJava7OrLater; > + try { > + Class.forName("java.util.Objects"); > + isJava7OrLater =3D true; > + } catch (ClassNotFoundException e) { > + isJava7OrLater =3D false; > + } > + IS_JAVA_7_OR_LATER =3D isJava7OrLater; > + } Isn't there a better way to detect Java versions? Maybe detect the version string and do a comparison? -chris ------enig2AGDXJFLGXPFXTJVTHGJM Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0.17 (Darwin) Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBCAAGBQJRyHKYAAoJEBzwKT+lPKRYmJkP/1Iz1fFliCq2XIAgAPR2aYT+ C3DwOy0tc/fG/NrG7OqNyQjWonvoaLqllfz/u1IolvH1pCsUncJYGZJGMZCBzklk QHujZoaZdFPOVr8iSjyPxqHKMrD668F4ia+ydo+Rf5nki+dHWGEYqu/tyftFWWRd AVF+9ndSKKCaQDrr3nxsgGrH9SeEiLad8VLcsNjzLkZnF6hMkm87cu8q/xmylK40 ZbWOP4yIReLxEGHyltgnP4mSlE7Tw8fnS7zCAYzSLlTPAvAUT5PYi3/PKDRuoP2g wuZj0PL8NMtN7630TOOqzgmjPrJCeErY/9Gq0bQ2x01586fKY154/hvwGMw5Gl1X LzZLKgLthRhNQVYtvORWOQzRxyaBVIJzr0Enqbfx6Qh6Z4eVP1pmnWUaonA6Zb4f diU4aOsCWgrH0Z9pxtKO7T3tRo2x79rWJ0JPsX+dsCCea/7kbfCukXJKdhXw663a HnTQdAmyqJWRXO1jOxVakSTI7nTP1lwWWyrkU/32FquyNe+TTte40+F2fZKxzNlw zySwHJYFiofeLn+EYZG8hHdE5OoXwAglobAUjb7+W3QmPdWSGFzVw1BUaeI1vE1H V9CZ3OIPi2d56fbkw6QlhJv7RsvcWg9aHumpMUHASU7qXQJUSRJ2gqVnvzEc9IuM 4bluy85FGXrm9mXZ3LTC =pax8 -----END PGP SIGNATURE----- ------enig2AGDXJFLGXPFXTJVTHGJM--