remm 2005/05/27 03:04:43
Modified: catalina/src/share/org/apache/catalina/core
AprLifecycleListener.java
jni/java/org/apache/tomcat/jni Library.java
Log:
- terminate(boolean) -> terminate().
Revision Changes Path
1.2 +3 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java
Index: AprLifecycleListener.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/core/AprLifecycleListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AprLifecycleListener.java 27 May 2005 09:41:38 -0000 1.1
+++ AprLifecycleListener.java 27 May 2005 10:04:43 -0000 1.2
@@ -78,13 +78,9 @@
} else if (Lifecycle.AFTER_STOP_EVENT.equals(event.getType())) {
try {
String methodName = "terminate";
- Class paramTypes[] = new Class[1];
- paramTypes[0] = Boolean.TYPE;
- Object paramValues[] = new Object[1];
- paramValues[0] = Boolean.TRUE;
Method method =
Class.forName("org.apache.tomcat.jni.Library")
- .getMethod(methodName, paramTypes);
- method.invoke(null, paramValues);
+ .getMethod(methodName, null);
+ method.invoke(null, null);
} catch (Throwable t) {
if (!log.isDebugEnabled()) {
log.info(sm.getString("aprListener.aprDestroy"));
1.5 +2 -14
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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Library.java 16 Apr 2005 09:17:38 -0000 1.4
+++ Library.java 27 May 2005 10:04:43 -0000 1.5
@@ -68,7 +68,7 @@
/* destroy global TCN's APR pool
* This has to be the last call to TCN library.
*/
- private static native void terminate();
+ public static native void terminate();
/* Internal function for loading APR Features */
private static native boolean has(int what);
/* Internal function for loading APR Features */
@@ -196,16 +196,4 @@
return initialize();
}
- /**
- * Tear down any APR internal data structures which aren't torn down
- * automatically.
- * An APR program must call this function at termination once it
- * has stopped using APR services.
- */
- static public void terminate(boolean doCleanup)
- {
- terminate();
- /* TODO: doCleanup code */
- }
-
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
