You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by di...@apache.org on 2008/03/30 07:01:26 UTC
svn commit: r642684 -
/webservices/axis2/trunk/c/src/core/transport/http/sender/ssl/ssl_stream.c
Author: dinesh
Date: Sat Mar 29 22:01:24 2008
New Revision: 642684
URL: http://svn.apache.org/viewvc?rev=642684&view=rev
Log:
add log messages and removed env checks
Modified:
webservices/axis2/trunk/c/src/core/transport/http/sender/ssl/ssl_stream.c
Modified: webservices/axis2/trunk/c/src/core/transport/http/sender/ssl/ssl_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/sender/ssl/ssl_stream.c?rev=642684&r1=642683&r2=642684&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/sender/ssl/ssl_stream.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/sender/ssl/ssl_stream.c Sat Mar 29 22:01:24 2008
@@ -78,7 +78,6 @@
axis2_char_t * ssl_pp)
{
ssl_stream_impl_t *stream_impl = NULL;
- AXIS2_ENV_CHECK(env, NULL);
stream_impl =
(ssl_stream_impl_t *) AXIS2_MALLOC(env->allocator,
@@ -89,6 +88,7 @@
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
+ memset ((void *)stream_impl, 0, sizeof (ssl_stream_impl_t));
stream_impl->socket = socket;
stream_impl->ctx = NULL;
stream_impl->ssl = NULL;
@@ -98,14 +98,14 @@
if (!stream_impl->ctx)
{
axis2_ssl_stream_free((axutil_stream_t *) stream_impl, env);
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SSL_ENGINE, AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env->error, AXIS2_ERROR_SSL_ENGINE, AXIS2_FAILURE);
return NULL;
}
stream_impl->ssl = axis2_ssl_utils_initialize_ssl(env, stream_impl->ctx,
stream_impl->socket);
if (!stream_impl->ssl)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SSL_ENGINE, AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env->error, AXIS2_ERROR_SSL_ENGINE, AXIS2_FAILURE);
return NULL;
}
stream_impl->stream_type = AXIS2_STREAM_MANAGED;
@@ -124,7 +124,6 @@
const axutil_env_t * env)
{
ssl_stream_impl_t *stream_impl = NULL;
- AXIS2_ENV_CHECK(env, void);
stream_impl = AXIS2_INTF_TO_IMPL(stream);
axis2_ssl_utils_cleanup_ssl(env, stream_impl->ctx, stream_impl->ssl);
@@ -144,7 +143,6 @@
int read = -1;
int len = -1;
- AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
stream_impl = AXIS2_INTF_TO_IMPL(stream);
@@ -181,7 +179,6 @@
ssl_stream_impl_t *stream_impl = NULL;
int write = -1;
- AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
AXIS2_PARAM_CHECK(env->error, buf, AXIS2_FAILURE);
stream_impl = AXIS2_INTF_TO_IMPL(stream);
write = SSL_write(stream_impl->ssl, buf, (int)count);
@@ -209,7 +206,6 @@
ssl_stream_impl_t *stream_impl = NULL;
axis2_char_t *tmp_buffer = NULL;
int len = -1;
- AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
stream_impl = AXIS2_INTF_TO_IMPL(stream);
tmp_buffer = AXIS2_MALLOC(env->allocator, count * sizeof(axis2_char_t));
@@ -230,7 +226,6 @@
const axutil_env_t * env)
{
int ret = -1;
- AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
return ret;
}
@@ -240,9 +235,14 @@
axutil_stream_t * stream,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
return AXIS2_INTF_TO_IMPL(stream)->stream_type;
}
#endif
+
+
+
+
+
+
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org