svn commit: r368776 - in /tomcat/connectors/trunk/jni: java/org/apache/tomcat/jni/File.java native/src/file.c

[mturk]

Author: mturk
Date: Fri Jan 13 08:29:09 2006
New Revision: 368776

URL: http://svn.apache.org/viewcvs?rev=368776&view=rev
Log:
Mark that pool for remove and rename is unused,
because APR actually does not use it.
No API and no functional change, and since it's not
used by APR connector, the patch is irrelevant :)

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=368776&r1=368775&r2=368776&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 Fri Jan 13 
08:29:09 2006
@@ -255,7 +255,7 @@
     /**
      * Delete the specified file.
      * @param path The full path to the file (using / on all systems)
-     * @param pool The pool to use.
+     * @param pool Unused.
      * 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 The pool to use.
+     * @param pool Unused.
      */
     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=368776&r1=368775&r2=368776&view=diff
==============================================================================
--- tomcat/connectors/trunk/jni/native/src/file.c (original)
+++ tomcat/connectors/trunk/jni/native/src/file.c Fri Jan 13 08:29:09 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);
-    rv = apr_file_remove(J2S(path), p);
+    UNREFERENCED(pool);
+    rv = apr_file_remove(J2S(path), NULL);
     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);
-    rv = apr_file_rename(J2S(from), J2S(to), p);
+    UNREFERENCED(pool);
+    rv = apr_file_rename(J2S(from), J2S(to), NULL);
     TCN_FREE_CSTRING(from);
     TCN_FREE_CSTRING(to);
     return (jint)rv;



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]