Attachment 681600 Details for Bug 900079 – fixwinloader.patch

fixwinloader.patch

fixwinloader.patch (text/x-patch), 1.28 KB, created by Mladen Turk on 2012-03-26 14:43:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mladen Turk

Created: 2012-03-26 14:43:47 UTC

Size: 1.28 KB

patch

obsolete

>Index: org/apache/tomcat/jni/LibraryLoader.java
>===================================================================
>--- org/apache/tomcat/jni/LibraryLoader.java	(revision 2004)
>+++ org/apache/tomcat/jni/LibraryLoader.java	(working copy)
>@@ -100,14 +100,15 @@
>             try {
>                 System.loadLibrary(dlibName);
>                 log.debug("Loaded: " + dlibName);
>-            } catch (Throwable d) {
>+                if (full)
>+                    break;
>+            }
>+            catch (Throwable d) {
>                 log.debug("Loading " + dlibName + " throws: " + d);
>                 if (optional)
>                    continue;
>                 throw new UnsatisfiedLinkError(" Error: " + d.getMessage() + " " );
>             }
>-            if (full)
>-                 break;
>         }
>     }
> 
>Index: org/apache/tomcat/jni/Library.properties
>===================================================================
>--- org/apache/tomcat/jni/Library.properties	(revision 2004)
>+++ org/apache/tomcat/jni/Library.properties	(working copy)
>@@ -23,8 +23,12 @@
> #
> # Library.properties
> #
>-windows.count=1
>-windows.0=*tcnative-1.dll
>+windows.count=5
>+windows.0=?*tcnative-1
>+windows.1=?libapr-1
>+windows.2=?libeay32
>+windows.3=?ssleay32
>+windows.4=libtcnative-1
> 
> linux2.count=5
> linux2.0=apr-1

Actions: View

Attachments on bug 900079: 681600