RE this:

On Tue, Oct 16, 2018 at 10:39 PM <isa...@apache.org> wrote:

> Author: isapir
> Date: Wed Oct 17 05:39:01 2018
> New Revision: 1844065
>
> URL: http://svn.apache.org/viewvc?rev=1844065&view=rev
> Log:
> Added util methods load and loadLibrary per BZ 62830
>
> Modified:
>     tomcat/trunk/java/org/apache/tomcat/jni/Library.java
>
>
I tried to backport it to tc8.5.x with the command:

tc8.5.x/trunk$ svn merge -c 1844065
https://svn.apache.org/repos/asf/tomcat/trunk

And I got a mergeinfo message that looked like it worked, but now I don't
see it in the tc8.5.x so not sure what happened there.

Igal



> Modified: tomcat/trunk/java/org/apache/tomcat/jni/Library.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/jni/Library.java?rev=1844065&r1=1844064&r2=1844065&view=diff
>
> ==============================================================================
> --- tomcat/trunk/java/org/apache/tomcat/jni/Library.java (original)
> +++ tomcat/trunk/java/org/apache/tomcat/jni/Library.java Wed Oct 17
> 05:39:01 2018
> @@ -254,4 +254,25 @@ public final class Library {
>          }
>          return initialize();
>      }
> +
> +    /**
> +     * Calls System.load(filename). Using this method will load the
> +     * native library via the Common ClassLoader so that it can
> +     * be used by all of the Webapps
> +     * @param filename - absolute path of the native library
> +     */
> +    public static void load(String filename){
> +        System.load(filename);
> +    }
> +
> +    /**
> +     * Calls System.loadLibrary(libname). Using this method will the
> +     * native library via the Common ClassLoader so that it can
> +     * be used by all of the Webapps
> +     * @param libname - the name of the native library
> +     */
> +    public static void loadLibrary(String libname){
> +        System.loadLibrary(libname);
> +    }
> +
>  }
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Reply via email to