Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 5D59C72FD for ; Tue, 2 Aug 2011 00:38:18 +0000 (UTC) Received: (qmail 40965 invoked by uid 500); 2 Aug 2011 00:38:18 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 40883 invoked by uid 500); 2 Aug 2011 00:38:17 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 40876 invoked by uid 99); 2 Aug 2011 00:38:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 02 Aug 2011 00:38:17 +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; Tue, 02 Aug 2011 00:38:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 99C5723888CD for ; Tue, 2 Aug 2011 00:37:55 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1152986 - /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java Date: Tue, 02 Aug 2011 00:37:55 -0000 To: commits@commons.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110802003755.99C5723888CD@eris.apache.org> Author: markt Date: Tue Aug 2 00:37:54 2011 New Revision: 1152986 URL: http://svn.apache.org/viewvc?rev=1152986&view=rev Log: Generics Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java?rev=1152986&r1=1152985&r2=1152986&view=diff ============================================================================== --- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java (original) +++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp2/datasources/InstanceKeyObjectFactory.java Tue Aug 2 00:37:54 2011 @@ -25,6 +25,7 @@ import java.util.Hashtable; import java.util.Map; import java.util.HashMap; import java.util.Iterator; +import java.util.Map.Entry; import java.util.Properties; import javax.naming.Context; @@ -42,19 +43,18 @@ import javax.naming.spi.ObjectFactory; abstract class InstanceKeyObjectFactory implements ObjectFactory { - private static final Map instanceMap = new HashMap(); + private static final Map instanceMap = + new HashMap(); synchronized static String registerNewInstance(InstanceKeyDataSource ds) { int max = 0; - Iterator i = instanceMap.keySet().iterator(); + Iterator i = instanceMap.keySet().iterator(); while (i.hasNext()) { - Object obj = i.next(); - if (obj instanceof String) - { + String s = i.next(); + if (s != null) { try { - max = Math.max(max, Integer.valueOf((String)obj).intValue()); - } - catch (NumberFormatException e) { + max = Math.max(max, Integer.valueOf(s).intValue()); + } catch (NumberFormatException e) { // no sweat, ignore those keys } } @@ -76,10 +76,10 @@ abstract class InstanceKeyObjectFactory */ public static void closeAll() throws Exception { //Get iterator to loop over all instances of this datasource. - Iterator instanceIterator = instanceMap.entrySet().iterator(); + Iterator> instanceIterator = + instanceMap.entrySet().iterator(); while (instanceIterator.hasNext()) { - ((InstanceKeyDataSource) - ((Map.Entry) instanceIterator.next()).getValue()).close(); + instanceIterator.next().getValue().close(); } instanceMap.clear(); } @@ -91,7 +91,7 @@ abstract class InstanceKeyObjectFactory */ @Override public Object getObjectInstance(Object refObj, Name name, - Context context, Hashtable env) + Context context, Hashtable env) throws IOException, ClassNotFoundException { // The spec says to return null if we can't create an instance // of the reference