Author: rfeng
Date: Tue Mar 11 11:01:56 2008
New Revision: 636039
URL: http://svn.apache.org/viewvc?rev=636039&view=rev
Log:
Fix the cache lookup
Modified:
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
Modified:
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java?rev=636039&r1=636038&r2=636039&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
(original)
+++
incubator/tuscany/java/sca/modules/contribution-java/src/main/java/org/apache/tuscany/sca/contribution/java/impl/ClassReferenceModelResolver.java
Tue Mar 11 11:01:56 2008
@@ -79,7 +79,10 @@
public <T> T resolveModel(Class<T> modelClass, T unresolved) {
- Object resolved = map.get(unresolved);
+ if (!(unresolved instanceof ClassReference)) {
+ return unresolved;
+ }
+ Object resolved = map.get(((ClassReference)unresolved).getClassName());
if (resolved != null) {
return modelClass.cast(resolved);
@@ -106,7 +109,7 @@
//if we load the class
// Store a new ClassReference wrappering the loaded class
ClassReference classReference = new ClassReference(clazz);
- map.put(getPackageName(classReference), classReference);
+ map.put(clazz.getName(), classReference);
// Return the resolved ClassReference
return modelClass.cast(classReference);
@@ -123,7 +126,7 @@
private String getPackageName(ClassReference clazz) {
int pos = clazz.getClassName().lastIndexOf(".");
- return clazz.getClassName().substring(0, pos - 1);
+ return clazz.getClassName().substring(0, pos);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
