Author: rjung
Date: Mon Jan 18 12:11:27 2016
New Revision: 1725249
URL: http://svn.apache.org/viewvc?rev=1725249&view=rev
Log:
Remove unused and commented out native method
cleanup() from lock.
Backport of r1725247 from trunk.
Modified:
tomcat/native/branches/1.1.x/ (props changed)
tomcat/native/branches/1.1.x/native/src/lock.c
Propchange: tomcat/native/branches/1.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan 18 12:11:27 2016
@@ -1,3 +1,3 @@
-/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1532601,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681306,1681314,1681323,1681419,1681505,1681507,1681509,1681520,1711591,1711609,1711651,1713237,1722542
+/tomcat/native/trunk:815411,988395,988402,988428,992208,1043611,1043696,1205445,1295445,1342003,1342008,1342013,1342020,1342024,1394258,1394342,1424947,1424971,1430753,1437081,1438342,1439337,1441884,1441886,1442579,1442581,1445972,1507113,1532577,1532590,1532601,1539594,1555184,1559180,1588195,1607262,1607267,1607278,1607291,1607477,1648821,1650119,1650304,1658557,1658641-1658642,1658724,1669302,1669496,1681126,1681147,1681150-1681151,1681172,1681189,1681218,1681295,1681298,1681306,1681314,1681323,1681419,1681505,1681507,1681509,1681520,1711591,1711609,1711651,1713237,1722542,1725247
/tomcat/tc7.0.x/trunk:1199985,1200164,1349932,1434887,1435769
/tomcat/trunk:815418,832198,1001939,1033916,1043103,1044729,1078522,1145209,1145285,1149092,1241356,1241406-1241407,1242254,1292671,1299980,1300102,1434905,1437083
Modified: tomcat/native/branches/1.1.x/native/src/lock.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/lock.c?rev=1725249&r1=1725248&r2=1725249&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/lock.c (original)
+++ tomcat/native/branches/1.1.x/native/src/lock.c Mon Jan 18 12:11:27 2016
@@ -86,17 +86,6 @@ TCN_IMPLEMENT_CALL(jint, Lock, destroy)(
return (jint)apr_proc_mutex_destroy(m);
}
-#if 0
-/* There is bug in APR implementing that function */
-TCN_IMPLEMENT_CALL(jint, Lock, cleanup)(TCN_STDARGS, jlong mutex)
-{
- void *m = J2P(mutex, void *);
-
- UNREFERENCED_STDARGS;
- return (jint)apr_proc_mutex_cleanup(m);
-}
-#endif
-
TCN_IMPLEMENT_CALL(jstring, Lock, lockfile)(TCN_STDARGS, jlong mutex)
{
apr_proc_mutex_t *m = J2P(mutex, apr_proc_mutex_t *);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
