From b67b6ef1431b9f7593c32caca387d2955d31fa84 Mon Sep 17 00:00:00 2001
From: samisa
Date: Mon, 29 Aug 2011 11:05:56 +0000
Subject: Fixing AXIS2C-1552 with given patch. Fixes the service skeleton init
 with a conf

git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@1162733 13f79535-47bb-0310-9956-ffa450edef68
---
 src/core/receivers/msg_recv.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/core/receivers/msg_recv.c b/src/core/receivers/msg_recv.c
index 87bcc1d..f1fed27 100644
--- a/src/core/receivers/msg_recv.c
+++ b/src/core/receivers/msg_recv.c
@@ -139,9 +139,17 @@ axis2_msg_recv_load_and_init_svc_impl(
 
     if(impl_class)
     {
-		axis2_conf_t *conf = NULL;
-		conf = axis2_conf_ctx_get_conf(msg_recv->conf_ctx, env);
-        AXIS2_SVC_SKELETON_INIT((axis2_svc_skeleton_t *)impl_class, env);
+        axis2_svc_skeleton_t *skel = (axis2_svc_skeleton_t *)impl_class;
+        axis2_conf_t *conf = NULL;
+        conf = axis2_conf_ctx_get_conf(msg_recv->conf_ctx, env);
+        if (skel->ops->init)
+        {
+            AXIS2_SVC_SKELETON_INIT(skel, env);
+        }
+        if (skel->ops->init_with_conf)
+        {
+            AXIS2_SVC_SKELETON_INIT_WITH_CONF(skel, env, conf);
+        }
     }
 
     axis2_svc_set_impl_class(svc, env, impl_class);
-- 
cgit v1.1-32-gdbae