Author: jfrederic.clere(a)jboss.com Date: 2012-03-27 02:53:46 -0400 (Tue, 27 Mar 2012) New Revision: 2006 Modified: branches/7.0.x/java/org/apache/tomcat/jni/Library.properties branches/7.0.x/java/org/apache/tomcat/jni/LibraryLoader.java branches/7.0.x/webapps/docs/changelog.xml Log: Fix for JBPAPP-8505. Modified: branches/7.0.x/java/org/apache/tomcat/jni/Library.properties =================================================================== --- branches/7.0.x/java/org/apache/tomcat/jni/Library.properties 2012-03-27 06:35:11 UTC (rev 2005) +++ branches/7.0.x/java/org/apache/tomcat/jni/Library.properties 2012-03-27 06:53:46 UTC (rev 2006) @@ -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 Modified: branches/7.0.x/java/org/apache/tomcat/jni/LibraryLoader.java =================================================================== --- branches/7.0.x/java/org/apache/tomcat/jni/LibraryLoader.java 2012-03-27 06:35:11 UTC (rev 2005) +++ branches/7.0.x/java/org/apache/tomcat/jni/LibraryLoader.java 2012-03-27 06:53:46 UTC (rev 2006) @@ -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; } } Modified: branches/7.0.x/webapps/docs/changelog.xml =================================================================== --- branches/7.0.x/webapps/docs/changelog.xml 2012-03-27 06:35:11 UTC (rev 2005) +++ branches/7.0.x/webapps/docs/changelog.xml 2012-03-27 06:53:46 UTC (rev 2006) @@ -20,6 +20,9 @@ <subsection name="Coyote"> <changelog> <fix> + <jboss-jira>JBPAPP-8505</jboss-jira>: Add back the multi files logic for Windows. (jfclere/mturk) + </fix> + <fix> <jboss-jira>AS7-3851</jboss-jira>: Cleanup IPv6 logging. (remm) </fix> <fix>