mturk 2005/05/28 01:18:09
Modified: jni/java/org/apache/tomcat/jni Library.java
jni/native/src jnilib.c
Log:
Check if we have at least APR 1.0 and Threading support.
Revision Changes Path
1.6 +10 -2
jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Library.java
Index: Library.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-connectors/jni/java/org/apache/tomcat/jni/Library.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Library.java 27 May 2005 10:04:43 -0000 1.5
+++ Library.java 28 May 2005 08:18:09 -0000 1.6
@@ -95,6 +95,8 @@
/* TCN_VERSION_STRING */
public static native String versionString();
+ /* APR_VERSION_STRING */
+ public static native String aprVersionString();
/* APR Feature Macros */
public static boolean APR_HAVE_IPV6 = false;
@@ -192,8 +194,14 @@
APR_CHARSET_EBCDIC = has(18);
APR_TCP_NODELAY_INHERITED = has(19);
APR_O_NONBLOCK_INHERITED = has(20);
+ if (APR_MAJOR_VERSION < 1) {
+ throw new UnsatisfiedLinkError("Unsupported APR Version (" +
+ aprVersionString() + ")");
+ }
+ if (!APR_HAS_THREADS) {
+ throw new UnsatisfiedLinkError("Missing APR_HAS_THREADS");
+ }
}
return initialize();
}
-
}
1.6 +7 -1 jakarta-tomcat-connectors/jni/native/src/jnilib.c
Index: jnilib.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jni/native/src/jnilib.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jnilib.c 27 May 2005 16:39:13 -0000 1.5
+++ jnilib.c 28 May 2005 08:18:09 -0000 1.6
@@ -231,6 +231,12 @@
return AJP_TO_JSTRING(TCN_VERSION_STRING);
}
+TCN_IMPLEMENT_CALL(jstring, Library, aprVersionString)(TCN_STDARGS)
+{
+ UNREFERENCED(o);
+ return AJP_TO_JSTRING(apr_version_string());
+}
+
TCN_IMPLEMENT_CALL(jboolean, Library, has)(TCN_STDARGS, jint what)
{
jboolean rv = JNI_FALSE;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
