//--------------------------------------------------------------------------
//	Copyright (c) 1998-2004, Drew Davidson and Luke Blanshard
//  All rights reserved.
//
//	Redistribution and use in source and binary forms, with or without
//  modification, are permitted provided that the following conditions are
//  met:
//
//	Redistributions of source code must retain the above copyright notice,
//  this list of conditions and the following disclaimer.
//	Redistributions in binary form must reproduce the above copyright
//  notice, this list of conditions and the following disclaimer in the
//  documentation and/or other materials provided with the distribution.
//	Neither the name of the Drew Davidson nor the names of its contributors
//  may be used to endorse or promote products derived from this software
//  without specific prior written permission.
//
//	THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
//  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
//  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
//  FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
//  COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
//  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
//  BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
//  OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
//  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
//  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
//  THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
//  DAMAGE.
//--------------------------------------------------------------------------
package ognl;

import java.util.*;

/**
 * Default class resolution.  Uses Class.forName() to look up classes by name.
 * It also looks in the "java.lang" package if the class named does not give
 * a package specifier, allowing easier usage of these classes.
 * @author Luke Blanshard (blanshlu@netscape.net)
 * @author Drew Davidson (drew@ognl.org)
 */
public class DefaultClassResolver extends Object implements ClassResolver
{
    private Map     classes = new HashMap(101);

    public DefaultClassResolver()
    {
        super();
    }

	public Class classForName(String className, Map context) throws ClassNotFoundException
	{
	    Class       result = null;

        if ((result = (Class)classes.get(className)) == null) {
    		try {
    		    result = Class.forName(className);
    		} catch (ClassNotFoundException ex) {
    			if (className.indexOf('.') == -1) {
    			    result = Class.forName("java.lang." + className);
        			classes.put("java.lang." + className, result);
        		}
    		}
			classes.put(className, result);
    	}
	    return result;
	}
}

@@ -1772,17 +1772,66 @@
 va.util.
-*
+Map;%0Aimport java.util.concurrent.ConcurrentHashMap
 ;%0A%0A/**%0A 
@@ -2254,16 +2254,26 @@
 s = new 
+Concurrent
 HashMap(
@@ -2814,16 +2814,51 @@
     %09%09%7D%0A
+            if (result != null) %7B%0A%09
 %09%09%09class
@@ -2880,24 +2880,38 @@
 e, result);%0A
+            %7D%0A
     %09%7D%0A%09    

Support concurrent on DefaultClassResolver