Author: rjung
Date: Sun May 24 12:42:20 2015
New Revision: 1681441
URL: http://svn.apache.org/r1681441
Log:
Revert r1681310:
Add unmanaged pool api.
Partial backport of r1205445 from trunk.
The API is not published in any version of the
Java API so no need to add in a stable branch.
Modified:
tomcat/native/branches/1.1.x/native/configure.in
tomcat/native/branches/1.1.x/native/src/pool.c
Modified: tomcat/native/branches/1.1.x/native/configure.in
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/configure.in?rev=1681441&r1=1681440&r2=1681441&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/configure.in (original)
+++ tomcat/native/branches/1.1.x/native/configure.in Sun May 24 12:42:20 2015
@@ -225,7 +225,6 @@ case $host in
esac
TCN_FIND_APR_FEATURE([apr_pool_pre_cleanup_register],[POOL_PRE_CLEANUP])
-TCN_FIND_APR_FEATURE([apr_pool_create_unmanaged_ex],[POOL_UNMANAGED])
TCN_FIND_APR_FEATURE([apr_pollset_wakeup],[POLLSET_WAKEUP])
AC_SUBST(TCNATIVE_EXPORT_LIBS)
Modified: tomcat/native/branches/1.1.x/native/src/pool.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/pool.c?rev=1681441&r1=1681440&r2=1681441&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/pool.c (original)
+++ tomcat/native/branches/1.1.x/native/src/pool.c Sun May 24 12:42:20 2015
@@ -50,24 +50,6 @@ cleanup:
return P2J(n);
}
-#if defined(HAVE_POOL_UNMANAGED)
-TCN_IMPLEMENT_CALL(jlong, Pool, unmanaged)(TCN_STDARGS)
-{
- apr_pool_t *n;
-
- UNREFERENCED(o);
- TCN_THROW_IF_ERR(apr_pool_create_unmanaged(&n), n);
-cleanup:
- return P2J(n);
-}
-#else
-TCN_IMPLEMENT_CALL(jlong, Pool, unmanaged)(TCN_STDARGS)
-{
- UNREFERENCED_STDARGS;
- return 0;
-}
-#endif
-
TCN_IMPLEMENT_CALL(void, Pool, clear)(TCN_STDARGS, jlong pool)
{
apr_pool_t *p = J2P(pool, apr_pool_t *);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
