You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jm...@apache.org on 2006/02/09 09:43:38 UTC
svn commit: r376224 - in /incubator/tuscany/java/sca:
container.java/src/main/java/org/apache/tuscany/container/java/handler/ScopedJavaComponentInvoker.java
core/src/main/java/org/apache/tuscany/core/builder/impl/PortRuntimeConfigurationBuilderImpl.java
Author: jmarino
Date: Thu Feb 9 00:43:37 2006
New Revision: 376224
URL: http://svn.apache.org/viewcvs?rev=376224&view=rev
Log:
NPE fix in samples due to JDKProxyFactory changes
Modified:
incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/handler/ScopedJavaComponentInvoker.java
incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/PortRuntimeConfigurationBuilderImpl.java
Modified: incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/handler/ScopedJavaComponentInvoker.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/handler/ScopedJavaComponentInvoker.java?rev=376224&r1=376223&r2=376224&view=diff
==============================================================================
--- incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/handler/ScopedJavaComponentInvoker.java (original)
+++ incubator/tuscany/java/sca/container.java/src/main/java/org/apache/tuscany/container/java/handler/ScopedJavaComponentInvoker.java Thu Feb 9 00:43:37 2006
@@ -33,6 +33,8 @@
private QualifiedName name;
+ private Object target;
+
public ScopedJavaComponentInvoker(String serviceName, Method operation, ScopeContext container) {
super(operation);
assert (serviceName != null) : "No service name specified";
@@ -41,8 +43,25 @@
this.container = container;
}
+ public boolean cacheable;
+
+ public boolean getCacheable() {
+ return cacheable;
+ }
+
+ public void setCacheable(boolean val) {
+ cacheable = val;
+ }
+
protected Object getInstance() throws TargetException {
- return container.getInstance(name);
+ if (!cacheable) {
+ return container.getInstance(name);
+ } else {
+ if (target == null) {
+ target = container.getInstance(name);
+ }
+ return target;
+ }
}
}
Modified: incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/PortRuntimeConfigurationBuilderImpl.java
URL: http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/PortRuntimeConfigurationBuilderImpl.java?rev=376224&r1=376223&r2=376224&view=diff
==============================================================================
--- incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/PortRuntimeConfigurationBuilderImpl.java (original)
+++ incubator/tuscany/java/sca/core/src/main/java/org/apache/tuscany/core/builder/impl/PortRuntimeConfigurationBuilderImpl.java Thu Feb 9 00:43:37 2006
@@ -127,9 +127,9 @@
// Create a proxy factory
ProxyFactory proxyFactory = new JDKProxyFactory();
try {
- proxyFactory.initialize();
proxyFactory.setBusinessInterface(javaInterface);
proxyFactory.setProxyConfiguration(proxyConfiguration);
+ proxyFactory.initialize();
} catch (ProxyInitializationException e) {
throw new ServiceRuntimeException(e);
}
@@ -173,9 +173,9 @@
// Create a proxy factory
ProxyFactory proxyFactory = new JDKProxyFactory();
try {
- proxyFactory.initialize();
proxyFactory.setBusinessInterface(javaInterface);
proxyFactory.setProxyConfiguration(proxyConfiguration);
+ proxyFactory.initialize();
} catch (ProxyInitializationException e) {
throw new ServiceRuntimeException(e);
}