Return-Path: X-Original-To: apmail-ode-commits-archive@www.apache.org Delivered-To: apmail-ode-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 83E871026F for ; Thu, 15 Aug 2013 22:52:48 +0000 (UTC) Received: (qmail 67589 invoked by uid 500); 15 Aug 2013 22:52:40 -0000 Delivered-To: apmail-ode-commits-archive@ode.apache.org Received: (qmail 67518 invoked by uid 500); 15 Aug 2013 22:52:40 -0000 Mailing-List: contact commits-help@ode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ode.apache.org Delivered-To: mailing list commits@ode.apache.org Received: (qmail 66833 invoked by uid 99); 15 Aug 2013 22:52:04 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Aug 2013 22:52:04 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 11E628378CF; Thu, 15 Aug 2013 22:52:03 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vanto@apache.org To: commits@ode.apache.org Date: Thu, 15 Aug 2013 22:52:05 -0000 Message-Id: In-Reply-To: <1a8c0e5cf8074c8e8ed38832573e1553@git.apache.org> References: <1a8c0e5cf8074c8e8ed38832573e1553@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [4/4] git commit: minor clean up. minor clean up. Project: http://git-wip-us.apache.org/repos/asf/ode-jacob/repo Commit: http://git-wip-us.apache.org/repos/asf/ode-jacob/commit/b9dcd896 Tree: http://git-wip-us.apache.org/repos/asf/ode-jacob/tree/b9dcd896 Diff: http://git-wip-us.apache.org/repos/asf/ode-jacob/diff/b9dcd896 Branch: refs/heads/master Commit: b9dcd896336de34e889788bcb3785a87915daa4d Parents: fdaf1f2 Author: Tammo van Lessen Authored: Fri Aug 16 00:51:13 2013 +0200 Committer: Tammo van Lessen Committed: Fri Aug 16 00:51:13 2013 +0200 ---------------------------------------------------------------------- src/main/java/org/apache/ode/jacob/Jacob.java | 2 +- src/main/java/org/apache/ode/jacob/JacobThread.java | 2 +- src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ode-jacob/blob/b9dcd896/src/main/java/org/apache/ode/jacob/Jacob.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/ode/jacob/Jacob.java b/src/main/java/org/apache/ode/jacob/Jacob.java index b636994..12fa1d4 100644 --- a/src/main/java/org/apache/ode/jacob/Jacob.java +++ b/src/main/java/org/apache/ode/jacob/Jacob.java @@ -41,7 +41,7 @@ public class Jacob { public static T newChannel(Class channelType, String description) throws IllegalArgumentException { - return (T) JacobVPU.activeJacobThread().newChannel(channelType, null, description); + return (T) JacobVPU.activeJacobThread().newChannel(channelType, description); } /** http://git-wip-us.apache.org/repos/asf/ode-jacob/blob/b9dcd896/src/main/java/org/apache/ode/jacob/JacobThread.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/ode/jacob/JacobThread.java b/src/main/java/org/apache/ode/jacob/JacobThread.java index 1d95c13..5d2f9ae 100644 --- a/src/main/java/org/apache/ode/jacob/JacobThread.java +++ b/src/main/java/org/apache/ode/jacob/JacobThread.java @@ -101,7 +101,7 @@ public interface JacobThread { /** * Create a new channel. */ - public Channel newChannel(Class channelType, String creator, String description); + public Channel newChannel(Class channelType, String description); /** *

http://git-wip-us.apache.org/repos/asf/ode-jacob/blob/b9dcd896/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java b/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java index ae4db3a..7061f96 100644 --- a/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java +++ b/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java @@ -264,7 +264,7 @@ public final class JacobVPU { throw new IllegalStateException( "Channel method '" + method + "' must only return void or an implementation of " + Channel.class.getName()); } - replyChannel = newChannel(method.getReturnType(), "", "Reply Channel"); + replyChannel = newChannel(method.getReturnType(), "Reply Channel"); replyCommChannel = (CommChannel) ChannelFactory.getBackend((Channel)replyChannel); } @@ -287,7 +287,7 @@ public final class JacobVPU { _executionQueue.add(grp); } - public Channel newChannel(Class channelType, String creator, String description) { + public Channel newChannel(Class channelType, String description) { CommChannel chnl = new CommChannel(channelType); chnl.setDescription(description); _executionQueue.add(chnl); @@ -491,6 +491,7 @@ public final class JacobVPU { } if (replyTo != null) { + //XXX: All replys have the same Synch.ret() action sendMessage(ClassUtil.createMessage(replyTo, ClassUtil.SYNCH_RET_METHOD_ACTION, null, null)); } } finally {