Return-Path: Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: (qmail 24325 invoked from network); 2 Apr 2011 16:59:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Apr 2011 16:59:07 -0000 Received: (qmail 61200 invoked by uid 500); 2 Apr 2011 16:59:07 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 61142 invoked by uid 500); 2 Apr 2011 16:59:07 -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 61135 invoked by uid 99); 2 Apr 2011 16:59:07 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 02 Apr 2011 16:59:07 +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; Sat, 02 Apr 2011 16:59:06 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 2230523889ED; Sat, 2 Apr 2011 16:58:46 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1088064 - /commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/EnvironmentCache.java Date: Sat, 02 Apr 2011 16:58:45 -0000 To: commits@commons.apache.org From: simonetripodi@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110402165846.2230523889ED@eris.apache.org> Author: simonetripodi Date: Sat Apr 2 16:58:45 2011 New Revision: 1088064 URL: http://svn.apache.org/viewvc?rev=1088064&view=rev Log: environment cache is a map of classloader,map Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/EnvironmentCache.java Modified: commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/EnvironmentCache.java URL: http://svn.apache.org/viewvc/commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/EnvironmentCache.java?rev=1088064&r1=1088063&r2=1088064&view=diff ============================================================================== --- commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/EnvironmentCache.java (original) +++ commons/proper/discovery/trunk/src/java/org/apache/commons/discovery/tools/EnvironmentCache.java Sat Apr 2 16:58:45 2011 @@ -17,6 +17,7 @@ package org.apache.commons.discovery.tools; import java.util.HashMap; +import java.util.Map; import org.apache.commons.discovery.jdk.JDKHooks; @@ -48,7 +49,7 @@ public class EnvironmentCache { * as HashMap (unsynchronized). * */ - private static final HashMap root_cache = new HashMap(); + private static final Map> root_cache = new HashMap>(); /** * Initial hash size for SPI's, default just seem TO big today.. @@ -58,7 +59,7 @@ public class EnvironmentCache { /** * Get object keyed by classLoader. */ - public static synchronized Object get(ClassLoader classLoader) + public static synchronized Map get(ClassLoader classLoader) { /** * 'null' (bootstrap/system class loader) thread context class loader @@ -70,14 +71,14 @@ public class EnvironmentCache { /** * Put service keyed by spi & classLoader. */ - public static synchronized void put(ClassLoader classLoader, Object object) + public static synchronized void put(ClassLoader classLoader, Map spis) { /** * 'null' (bootstrap/system class loader) thread context class loader * is ok... Until we learn otherwise. */ - if (object != null) { - root_cache.put(classLoader, object); + if (spis != null) { + root_cache.put(classLoader, spis); } }