You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/10/17 12:07:39 UTC
svn commit: r826218 -
/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
Author: slaws
Date: Sat Oct 17 10:07:39 2009
New Revision: 826218
URL: http://svn.apache.org/viewvc?rev=826218&view=rev
Log:
TUSCANY-3312 - change JavaInterface interface reference to a weak reference to avoid this holding onto the interface when stored in the JavaInterfaceFactory cache
Modified:
tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
Modified: tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java?rev=826218&r1=826217&r2=826218&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java (original)
+++ tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/impl/JavaInterfaceImpl.java Sat Oct 17 10:07:39 2009
@@ -18,8 +18,9 @@
*/
package org.apache.tuscany.sca.interfacedef.java.impl;
-import javax.xml.namespace.QName;
+import java.lang.ref.WeakReference;
+import javax.xml.namespace.QName;
import org.apache.tuscany.sca.interfacedef.impl.InterfaceImpl;
import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
@@ -31,7 +32,7 @@
public class JavaInterfaceImpl extends InterfaceImpl implements JavaInterface {
private String className;
- private Class<?> javaClass;
+ private WeakReference<Class<?>> javaClass;
private Class<?> callbackClass;
private QName qname;
@@ -42,7 +43,7 @@
if (isUnresolved()) {
return className;
} else if (javaClass != null) {
- return javaClass.getName();
+ return javaClass.get().getName();
} else {
return null;
}
@@ -64,11 +65,15 @@
}
public Class<?> getJavaClass() {
- return javaClass;
+ if (javaClass != null){
+ return javaClass.get();
+ } else {
+ return null;
+ }
}
public void setJavaClass(Class<?> javaClass) {
- this.javaClass = javaClass;
+ this.javaClass = new WeakReference<Class<?>>(javaClass);
if (javaClass != null) {
this.className = javaClass.getName();
}
@@ -119,7 +124,7 @@
if (javaClass == null) {
if (other.javaClass != null)
return false;
- } else if (!javaClass.equals(other.javaClass))
+ } else if (!javaClass.get().equals(other.javaClass.get()))
return false;
if (callbackClass == null) {
if (other.callbackClass != null)