You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by jb...@apache.org on 2007/03/11 00:52:21 UTC
svn commit: r516812 -
/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java
Author: jboynes
Date: Sat Mar 10 15:52:20 2007
New Revision: 516812
URL: http://svn.apache.org/viewvc?view=rev&rev=516812
Log:
simplify
Modified:
incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java
Modified: incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java?view=diff&rev=516812&r1=516811&r2=516812
==============================================================================
--- incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java (original)
+++ incubator/tuscany/java/sca/kernel/core/src/main/java/org/apache/tuscany/core/implementation/java/JavaTargetInvoker.java Sat Mar 10 15:52:20 2007
@@ -100,20 +100,25 @@
* Resolves the target service instance or returns a cached one
*/
protected Object getInstance(short sequence) throws TargetException {
- if (!cacheable) {
- if (sequence == START || sequence == NONE) {
- return component.getTargetInstance();
- } else if (sequence == CONTINUE || sequence == END) {
- return component.getAssociatedTargetInstance();
+ switch (sequence) {
+ case NONE:
+ if (cacheable) {
+ if (target == null) {
+ target = component.getTargetInstance();
+ }
+ return target;
} else {
- throw new InvalidConversationSequenceException("Unknown sequence type", String.valueOf(sequence));
- }
- } else {
- assert sequence == NONE; // conversations are not cacheable
- if (target == null) {
- target = component.getTargetInstance();
+ return component.getTargetInstance();
}
- return target;
+ case START:
+ assert !cacheable;
+ return component.getTargetInstance();
+ case CONTINUE:
+ case END:
+ assert !cacheable;
+ return component.getAssociatedTargetInstance();
+ default:
+ throw new InvalidConversationSequenceException("Unknown sequence type", String.valueOf(sequence));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org