Author: damitha
Date: Mon Jul 7 18:05:36 2008
New Revision: 674689
URL: http://svn.apache.org/viewvc?rev=674689&view=rev
Log: (empty)
Modified:
webservices/savan/trunk/c/include/savan_sub_processor.h
webservices/savan/trunk/c/src/core/savan_sub_processor.c
webservices/savan/trunk/c/src/data/module.xml
webservices/savan/trunk/c/src/handlers/savan_in_handler.c
Modified: webservices/savan/trunk/c/include/savan_sub_processor.h
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/include/savan_sub_processor.h?rev=674689&r1=674688&r2=674689&view=diff
==============================================================================
--- webservices/savan/trunk/c/include/savan_sub_processor.h (original)
+++ webservices/savan/trunk/c/include/savan_sub_processor.h Mon Jul 7 18:05:36
2008
@@ -40,7 +40,7 @@
{
#endif
- typedef struct savan_sub_processor_t savan_sub_processor_t;
+ typedef struct savan_sub_processor savan_sub_processor_t;
/**
* This method creates a subcription object from the incoming message
@@ -109,7 +109,17 @@
AXIS2_EXTERN savan_sub_processor_t * AXIS2_CALL
savan_sub_processor_create(
const axutil_env_t *env);
-
+
+ /**
+ * Freesf a subscription manager instance.
+ * @param env pointer to the environment struct
+ * @param sub_processor pointer to the sub_processor struct
+ */
+ AXIS2_EXTERN void AXIS2_CALL
+ savan_sub_processor_free(
+ savan_sub_processor_t * sub_processor,
+ const axutil_env_t * env);
+
/** @} */
#ifdef __cplusplus
}
Modified: webservices/savan/trunk/c/src/core/savan_sub_processor.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/core/savan_sub_processor.c?rev=674689&r1=674688&r2=674689&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/core/savan_sub_processor.c (original)
+++ webservices/savan/trunk/c/src/core/savan_sub_processor.c Mon Jul 7
18:05:36 2008
@@ -29,7 +29,7 @@
#include <savan_util.h>
#include <savan_db_mgr.h>
-struct savan_sub_processor_t
+struct savan_sub_processor
{
int dummy;
};
@@ -74,7 +74,8 @@
AXIS2_ENV_CHECK(env, NULL);
- sub_processor = AXIS2_MALLOC( env->allocator,
sizeof(savan_sub_processor_t));
+ sub_processor = AXIS2_MALLOC(env->allocator,
+ sizeof(savan_sub_processor_t));
if (!sub_processor)
{
@@ -115,6 +116,7 @@
/* Set the expiry time on the subscription */
/* TODO : For now we are ignoring the Expiry sent by the client. Add
support
* to consider this when setting the expiry time */
+
expires = savan_util_get_expiry_time(env);
savan_subscriber_set_expires(subscriber, env, expires);
@@ -130,7 +132,7 @@
*/
if (savan_sub_processor_validate_subscription(subscriber, env, msg_ctx)
- == AXIS2_FAILURE)
+ == AXIS2_FAILURE)
{
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "[SAVAN] End:"
"savan_sub_processor_subscribe"
@@ -236,7 +238,9 @@
if (!renewable)
{
savan_util_create_fault_envelope(msg_ctx, env, SAVAN_FAULT_UTR_CODE,
- SAVAN_FAULT_UTR_SUB_CODE,
"Subscription can not be renewed.", NULL);
+ SAVAN_FAULT_UTR_SUB_CODE,
+ "Subscription can not be renewed.",
+ NULL);
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
"[SAVAN] Subscription can not be renewed");
@@ -250,7 +254,9 @@
savan_subscriber_set_renew_status(subscriber, env, AXIS2_TRUE);
conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
- status = savan_db_mgr_update_subscriber(env, savan_util_get_dbname(env,
conf), subscriber);
+ status = savan_db_mgr_update_subscriber(env,
+ savan_util_get_dbname(env, conf),
+ subscriber);
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
"[SAVAN] End:savan_sub_processor_renew_subscription");
@@ -285,8 +291,6 @@
/******************************************************************************/
-/******************************************************************************/
-
savan_subscriber_t * AXIS2_CALL
savan_sub_processor_create_subscriber_from_msg(
const axutil_env_t *env,
@@ -506,7 +510,6 @@
/******************************************************************************/
-
axis2_bool_t AXIS2_CALL
savan_sub_processor_validate_delivery_mode(
savan_subscriber_t *subscriber,
@@ -535,7 +538,6 @@
return AXIS2_FAILURE;
}
-
return AXIS2_SUCCESS;
}
@@ -611,7 +613,6 @@
"Server does not support the
dialect.");
return AXIS2_FAILURE;
}
-
}
/****************************************************************************/
@@ -643,3 +644,14 @@
}
/******************************************************************************/
+
+AXIS2_EXTERN void AXIS2_CALL
+savan_sub_processor_free(
+ savan_sub_processor_t * sub_processor,
+ const axutil_env_t * env)
+{
+ if (sub_processor)
+ AXIS2_FREE(env->allocator, sub_processor);
+}
+
+/******************************************************************************/
Modified: webservices/savan/trunk/c/src/data/module.xml
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/data/module.xml?rev=674689&r1=674688&r2=674689&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/data/module.xml (original)
+++ webservices/savan/trunk/c/src/data/module.xml Mon Jul 7 18:05:36 2008
@@ -1,5 +1,5 @@
<module name="savan" class="mod_savan">
- <!--parameter name="SubscriptionMgrURL"
locked="xsd:false">http://localhost:9092/axis2/services/subscription</parameter-->
+ <parameter name="SubscriptionMgrURL"
locked="xsd:false">http://localhost:9092/axis2/services/subscription</parameter>
<!-- Database connection parameters -->
<parameter name="savan_db" locked="false">/tmp/savan_db</parameter>
<inflow>
Modified: webservices/savan/trunk/c/src/handlers/savan_in_handler.c
URL:
http://svn.apache.org/viewvc/webservices/savan/trunk/c/src/handlers/savan_in_handler.c?rev=674689&r1=674688&r2=674689&view=diff
==============================================================================
--- webservices/savan/trunk/c/src/handlers/savan_in_handler.c (original)
+++ webservices/savan/trunk/c/src/handlers/savan_in_handler.c Mon Jul 7
18:05:36 2008
@@ -163,6 +163,7 @@
axis2_op_set_msg_recv(op, env, msg_recv);
}
+ savan_sub_processor_free(processor, env);
AXIS2_LOG_TRACE(env->log, AXIS2_LOG_SI, "[savan]
End:savan_in_handler_invoke");
return AXIS2_SUCCESS;
