Return-Path: Delivered-To: apmail-tomcat-dev-archive@www.apache.org Received: (qmail 5387 invoked from network); 3 Jan 2009 01:30:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Jan 2009 01:30:54 -0000 Received: (qmail 35599 invoked by uid 500); 3 Jan 2009 01:30:47 -0000 Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org Received: (qmail 35548 invoked by uid 500); 3 Jan 2009 01:30:47 -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 35537 invoked by uid 99); 3 Jan 2009 01:30:47 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Jan 2009 17:30:47 -0800 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; Sat, 03 Jan 2009 01:30:45 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4E39623888F1; Fri, 2 Jan 2009 17:30:24 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r730885 - /tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java Date: Sat, 03 Jan 2009 01:30:24 -0000 To: dev@tomcat.apache.org From: fhanik@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090103013024.4E39623888F1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fhanik Date: Fri Jan 2 17:30:23 2009 New Revision: 730885 URL: http://svn.apache.org/viewvc?rev=730885&view=rev Log: Make system compile with JDK1.5 Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java Modified: tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=730885&r1=730884&r2=730885&view=diff ============================================================================== --- tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java (original) +++ tomcat/trunk/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java Fri Jan 2 17:30:23 2009 @@ -42,7 +42,7 @@ } public ConnectionPool(org.apache.tomcat.jdbc.pool.ConnectionPool pool, boolean for16) { - super(getDefaultNotificationInfo()); + super(); this.pool = pool; } @@ -61,8 +61,16 @@ @Override public MBeanNotificationInfo[] getNotificationInfo() { - return getDefaultNotificationInfo(); - } + MBeanNotificationInfo[] pres = super.getNotificationInfo(); + MBeanNotificationInfo[] loc = getDefaultNotificationInfo(); + MBeanNotificationInfo[] aug = new MBeanNotificationInfo[ + pres.length + loc.length + ]; + System.arraycopy(pres, 0, aug, 0, pres.length); + System.arraycopy(loc, 0, aug, pres.length+1, loc.length); + + return aug; + } public static MBeanNotificationInfo[] getDefaultNotificationInfo() { String[] types = new String[] {NOTIFY_INIT, NOTIFY_CONNECT, NOTIFY_ABANDON}; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org For additional commands, e-mail: dev-help@tomcat.apache.org