From 4dc46ce5d021fe0c1cb034cf9fc1f4f8e6f5ebe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Bon=C3=A9r?= Date: Mon, 29 Mar 2010 11:09:37 +0200 Subject: [PATCH] removed usused code --- .../src/main/scala/actor/ActiveObject.scala | 57 +------------------ 1 file changed, 1 insertion(+), 56 deletions(-) diff --git a/akka-core/src/main/scala/actor/ActiveObject.scala b/akka-core/src/main/scala/actor/ActiveObject.scala index 4cb2d2aba8..6cace70ec5 100644 --- a/akka-core/src/main/scala/actor/ActiveObject.scala +++ b/akka-core/src/main/scala/actor/ActiveObject.scala @@ -275,7 +275,7 @@ private[akka] sealed class ActiveObjectAspect { private def remoteDispatch(joinPoint: JoinPoint): AnyRef = { val rtti = joinPoint.getRtti.asInstanceOf[MethodRtti] - val oneWay_? = isOneWay(rtti) + val oneWay_? = isOneWay(rtti) || isVoid(rtti) val (message: Array[AnyRef], isEscaped) = escapeArguments(rtti.getParameterValues) val requestBuilder = RemoteRequest.newBuilder .setId(RemoteRequestIdFactory.nextId) @@ -471,58 +471,3 @@ private[akka] class Dispatcher(transactionalRequired: Boolean, val callbacks: Op } } } - -/* -ublic class CamelInvocationHandler implements InvocationHandler { - private final Endpoint endpoint; - private final Producer producer; - private final MethodInfoCache methodInfoCache; - - public CamelInvocationHandler(Endpoint endpoint, Producer producer, MethodInfoCache methodInfoCache) { - this.endpoint = endpoint; - this.producer = producer; - this.methodInfoCache = methodInfoCache; - } - - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - BeanInvocation invocation = new BeanInvocation(method, args); - ExchangePattern pattern = ExchangePattern.InOut; - MethodInfo methodInfo = methodInfoCache.getMethodInfo(method); - if (methodInfo ne null) { - pattern = methodInfo.getPattern(); - } - Exchange exchange = new DefaultExchange(endpoint, pattern); - exchange.getIn().setBody(invocation); - - producer.process(exchange); - Throwable fault = exchange.getException(); - if (fault ne null) { - throw new InvocationTargetException(fault); - } - if (pattern.isOutCapable()) { - return exchange.getOut().getBody(); - } else { - return null; - } - } -} - - if (joinpoint.target.isInstanceOf[MessageDriven] && - joinpoint.method.getName == "onMessage") { - val m = joinpoint.method - - val endpointName = m.getDeclaringClass.getName + "." + m.getName - val activeObjectName = m.getDeclaringClass.getName - val endpoint = conf.getRoutingEndpoint(conf.lookupUriFor(m)) - val producer = endpoint.createProducer - val exchange = endpoint.createExchange - exchange.getIn().setBody(joinpoint) - producer.process(exchange) - val fault = exchange.getException(); - if (fault ne null) throw new InvocationTargetException(fault) - - // FIXME: need some timeout and future here... - exchange.getOut.getBody - - } else -*/