You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2006/01/14 09:08:52 UTC
svn commit: r369000 - in /tomcat/connectors/trunk/jni:
java/org/apache/tomcat/jni/File.java native/src/file.c
Author: mturk
Date: Sat Jan 14 00:08:44 2006
New Revision: 369000
URL: http://svn.apache.org/viewcvs?rev=369000&view=rev
Log:
Revert note about unused pool. APR guys say it might
be used sometime in the future :)
Modified:
tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/File.java
tomcat/connectors/trunk/jni/native/src/file.c
Modified: tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/File.java
URL: http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/File.java?rev=369000&r1=368999&r2=369000&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/File.java (original)
+++ tomcat/connectors/trunk/jni/java/org/apache/tomcat/jni/File.java Sat Jan 14 00:08:44 2006
@@ -255,7 +255,7 @@
/**
* Delete the specified file.
* @param path The full path to the file (using / on all systems)
- * @param pool Unused.
+ * @param pool The pool to use.
* If the file is open, it won't be removed until all
* instances are closed.
*/
@@ -268,7 +268,7 @@
* possible.
* @param fromPath The full path to the original file (using / on all systems)
* @param toPath The full path to the new file (using / on all systems)
- * @param pool Unused.
+ * @param pool The pool to use.
*/
public static native int rename(String fromPath, String toPath, long pool);
Modified: tomcat/connectors/trunk/jni/native/src/file.c
URL: http://svn.apache.org/viewcvs/tomcat/connectors/trunk/jni/native/src/file.c?rev=369000&r1=368999&r2=369000&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/src/file.c (original)
+++ tomcat/connectors/trunk/jni/native/src/file.c Sat Jan 14 00:08:44 2006
@@ -112,12 +112,12 @@
TCN_IMPLEMENT_CALL(jint, File, remove)(TCN_STDARGS, jstring path, jlong pool)
{
+ apr_pool_t *p = J2P(pool, apr_pool_t *);
TCN_ALLOC_CSTRING(path);
apr_status_t rv;
UNREFERENCED(o);
- UNREFERENCED(pool);
- rv = apr_file_remove(J2S(path), NULL);
+ rv = apr_file_remove(J2S(path), p);
TCN_FREE_CSTRING(path);
return (jint)rv;
}
@@ -125,13 +125,13 @@
TCN_IMPLEMENT_CALL(jint, File, rename)(TCN_STDARGS, jstring from,
jstring to, jlong pool)
{
+ apr_pool_t *p = J2P(pool, apr_pool_t *);
TCN_ALLOC_CSTRING(from);
TCN_ALLOC_CSTRING(to);
apr_status_t rv;
UNREFERENCED(o);
- UNREFERENCED(pool);
- rv = apr_file_rename(J2S(from), J2S(to), NULL);
+ rv = apr_file_rename(J2S(from), J2S(to), p);
TCN_FREE_CSTRING(from);
TCN_FREE_CSTRING(to);
return (jint)rv;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org