Author: gerdogdu
Date: Tue Aug 10 14:06:27 2010
New Revision: 984013
URL: http://svn.apache.org/viewvc?rev=984013&view=rev
Log:
use object insted of classloader for generalization
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java?rev=984013&r1=984012&r2=984013&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/WebBeansFinder.java
Tue Aug 10 14:06:27 2010
@@ -52,25 +52,25 @@ public final class WebBeansFinder
return getSingletonInstance(singletonName,
WebBeansUtil.getCurrentClassLoader());
}
- public static Object getSingletonInstance(String singletonName,
ClassLoader classLoader)
+ public static Object getSingletonInstance(String singletonName, Object key)
{
- return singletonService.get(classLoader, singletonName);
+ return singletonService.get(key, singletonName);
}
- public static Object getExistingSingletonInstance(String singletonName,
ClassLoader cl)
+ public static Object getExistingSingletonInstance(String singletonName,
Object key)
{
- return singletonService.getExist(cl, singletonName);
+ return singletonService.getExist(key, singletonName);
}
- public static void clearInstances(ClassLoader classLoader)
+ public static void clearInstances(Object key)
{
- singletonService.clear(classLoader);
+ singletonService.clear(key);
}
- public static Object getSingletonClassLoader(Object object)
+ public static Object getSingletonClassLoader(Object singletonInstance)
{
- return singletonService.getKey(object);
+ return singletonService.getKey(singletonInstance);
}
// Thirdt pary frameworks can set singleton instance
