Return-Path: X-Original-To: apmail-celix-commits-archive@www.apache.org Delivered-To: apmail-celix-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 92DC611064 for ; Mon, 22 Sep 2014 08:17:32 +0000 (UTC) Received: (qmail 10425 invoked by uid 500); 22 Sep 2014 08:17:32 -0000 Delivered-To: apmail-celix-commits-archive@celix.apache.org Received: (qmail 10400 invoked by uid 500); 22 Sep 2014 08:17:32 -0000 Mailing-List: contact commits-help@celix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@celix.apache.org Delivered-To: mailing list commits@celix.apache.org Received: (qmail 10391 invoked by uid 99); 22 Sep 2014 08:17:32 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Sep 2014 08:17:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Sep 2014 08:17:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id C63972388868; Mon, 22 Sep 2014 08:17:10 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1626692 - in /celix/trunk/remote_services: calculator_proxy/private/src/calculator_proxy_impl.c remote_service_admin/public/include/remote_endpoint_impl.h Date: Mon, 22 Sep 2014 08:17:10 -0000 To: commits@celix.apache.org From: abroekhuis@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140922081710.C63972388868@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: abroekhuis Date: Mon Sep 22 08:17:10 2014 New Revision: 1626692 URL: http://svn.apache.org/r1626692 Log: Updated proxy to use an object for the reply Modified: celix/trunk/remote_services/calculator_proxy/private/src/calculator_proxy_impl.c celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint_impl.h Modified: celix/trunk/remote_services/calculator_proxy/private/src/calculator_proxy_impl.c URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/calculator_proxy/private/src/calculator_proxy_impl.c?rev=1626692&r1=1626691&r2=1626692&view=diff ============================================================================== --- celix/trunk/remote_services/calculator_proxy/private/src/calculator_proxy_impl.c (original) +++ celix/trunk/remote_services/calculator_proxy/private/src/calculator_proxy_impl.c Mon Sep 22 08:17:10 2014 @@ -75,10 +75,11 @@ celix_status_t calculatorProxy_add(calcu calculator->sendToCallback(calculator->sendToHandler, calculator->endpoint, data, &reply, &replyStatus); if (status == CELIX_SUCCESS) { + printf("Handle reply: %s\n", reply); json_error_t error; - json_t *js_reply = json_loads(reply, JSON_DECODE_ANY, &error); + json_t *js_reply = json_loads(reply, 0, &error); if (js_reply) { - json_unpack(js_reply, "f", result); + json_unpack(js_reply, "{s:f}", "r", result); } else { printf("PROXY: got error '%s' for '%s'\n", error.text, reply); status = CELIX_BUNDLE_EXCEPTION; @@ -109,7 +110,7 @@ celix_status_t calculatorProxy_sub(calcu if (status == CELIX_SUCCESS) { json_error_t error; - json_t *js_reply = json_loads(reply, JSON_DECODE_ANY, &error); + json_t *js_reply = json_loads(reply, 0, &error); if (js_reply) { json_unpack(js_reply, "f", result); } else { Modified: celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint_impl.h URL: http://svn.apache.org/viewvc/celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint_impl.h?rev=1626692&r1=1626691&r2=1626692&view=diff ============================================================================== --- celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint_impl.h (original) +++ celix/trunk/remote_services/remote_service_admin/public/include/remote_endpoint_impl.h Mon Sep 22 08:17:10 2014 @@ -31,7 +31,7 @@ struct remote_endpoint { void *service; - apr_pool_t* pool; +// apr_pool_t* pool; }; #endif /* REMOTE_ENDPOINT_IMPL_H_ */