You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/10/25 11:09:14 UTC
svn commit: r1026981 - in /tuscany/sca-java-2.x/trunk/modules:
core-spi/src/main/java/org/apache/tuscany/sca/context/
domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/
node-impl/src/main/java/org/apache/tuscany/sca/node/impl/
Author: antelder
Date: Mon Oct 25 09:09:14 2010
New Revision: 1026981
URL: http://svn.apache.org/viewvc?rev=1026981&view=rev
Log:
Remove CompositeContext threadlocal thats might be causeing a storage leak as Tuscany doesn't use this anymore
Modified:
tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/DeployedComposite.java
tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
Modified: tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java?rev=1026981&r1=1026980&r2=1026981&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/core-spi/src/main/java/org/apache/tuscany/sca/context/CompositeContext.java Mon Oct 25 09:09:14 2010
@@ -35,7 +35,7 @@ import org.apache.tuscany.sca.runtime.Ru
* @version $Rev$ $Date$
*/
public class CompositeContext {
- protected final static InheritableThreadLocal<CompositeContext> context = new InheritableThreadLocal<CompositeContext>();
+
protected ExtensionPointRegistry extensionPointRegistry;
protected EndpointRegistry endpointRegistry;
protected ComponentContextFactory componentContextFactory;
@@ -84,10 +84,6 @@ public class CompositeContext {
RuntimeComponentContext componentContext = component.getComponentContext();
return componentContext.getCompositeContext();
}
- CompositeContext compositeContext = context.get();
- if (compositeContext != null) {
- return compositeContext;
- }
return null;
}
@@ -124,14 +120,6 @@ public class CompositeContext {
return domainComposite;
}
- public static void setThreadCompositeContext(CompositeContext value) {
- context.set(value);
- }
-
- public static void removeCompositeContext() {
- context.remove();
- }
-
public String getNodeURI() {
return nodeURI;
}
Modified: tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/DeployedComposite.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/DeployedComposite.java?rev=1026981&r1=1026980&r2=1026981&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/DeployedComposite.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/domain-node/src/main/java/org/apache/tuscany/sca/node2/impl/DeployedComposite.java Mon Oct 25 09:09:14 2010
@@ -102,8 +102,6 @@ public class DeployedComposite {
null, // don't need node uri
deployer.getSystemDefinitions());
- CompositeContext.setThreadCompositeContext(compositeContext); // TODO: what is this doing?
-
compositeActivator.activate(compositeContext, domainComposite);
compositeActivator.start(compositeContext, domainComposite);
Modified: tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java?rev=1026981&r1=1026980&r2=1026981&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java (original)
+++ tuscany/sca-java-2.x/trunk/modules/node-impl/src/main/java/org/apache/tuscany/sca/node/impl/NodeImpl.java Mon Oct 25 09:09:14 2010
@@ -134,7 +134,6 @@ public class NodeImpl implements Node {
configuration.getURI(),
nodeFactory.getDeployer().getSystemDefinitions());
- CompositeContext.setThreadCompositeContext(compositeContext);
} finally {
// Reset the thread context monitor
nodeFactory.monitorFactory.setContextMonitor(tcm);
@@ -213,7 +212,6 @@ public class NodeImpl implements Node {
this.compositeContext = null;
ThreadMessageContext.removeMessageContext();
- CompositeContext.removeCompositeContext();
} catch (ActivationException e) {
throw new IllegalStateException(e);