Author: rjung
Date: Sat May 23 12:59:49 2015
New Revision: 1681344
URL: http://svn.apache.org/r1681344
Log:
Whitespace and minor changes to sync 1.1 with trunk.
Modified:
tomcat/native/branches/1.1.x/native/src/jnilib.c
Modified: tomcat/native/branches/1.1.x/native/src/jnilib.c
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/native/src/jnilib.c?rev=1681344&r1=1681343&r2=1681344&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/native/src/jnilib.c (original)
+++ tomcat/native/branches/1.1.x/native/src/jnilib.c Sat May 23 12:59:49 2015
@@ -54,17 +54,16 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM
tcn_global_vm = vm;
env = (JNIEnv *)ppe;
/* Before doing anything else check if we have a valid
- * APR version.
+ * APR version. We need version 1.2.1 as minimum.
*/
apr_version(&apv);
apvn = apv.major * 1000 + apv.minor * 100 + apv.patch;
if (apvn < 1201) {
- tcn_Throw(env, "Unsupported APR version (%s): this tcnative requires
at least 1.2.1",
+ tcn_Throw(env, "Unsupported APR version %s: this tcnative requires at
least 1.2.1",
apr_version_string());
return JNI_ERR;
}
-
/* Initialize global java.lang.String class */
TCN_LOAD_CLASS(env, jString_class, "java/lang/String", JNI_ERR);
TCN_LOAD_CLASS(env, jFinfo_class, TCN_FINFO_CLASS, JNI_ERR);
@@ -229,7 +228,7 @@ TCN_IMPLEMENT_CALL(void, Library, termin
{
UNREFERENCED_STDARGS;
- if (tcn_global_pool) {
+ if (tcn_global_pool) {
apr_pool_t *p = tcn_global_pool;
tcn_global_pool = NULL;
#ifdef TCN_DO_STATISTICS
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
