Author: markt
Date: Sat Oct 3 16:08:54 2009
New Revision: 821348
URL: http://svn.apache.org/viewvc?rev=821348&view=rev
Log:
Fix a couple of Java 1.5 uses that should be 1.4 compatible
Modified:
tomcat/tc5.5.x/trunk/STATUS.txt
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/io/BufferPool14Impl.java
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java
Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=821348&r1=821347&r2=821348&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Sat Oct 3 16:08:54 2009
@@ -67,11 +67,6 @@
+1: kkolinko
-1:
-* Fix a couple of Java 1.5 uses that should be 1.4 compatible
- http://people.apache.org/~markt/patches/2009-08-12-tc5.5.x-java14.patch
- +1: markt, rjung, kkolinko
- -1:
-
* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42390
Fix compilation error with some nested tag files and simple tags
This is Konstantin's original patch
Modified:
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/io/BufferPool14Impl.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/io/BufferPool14Impl.java?rev=821348&r1=821347&r2=821348&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/io/BufferPool14Impl.java
(original)
+++
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/io/BufferPool14Impl.java
Sat Oct 3 16:08:54 2009
@@ -16,7 +16,6 @@
*/
package org.apache.catalina.tribes.io;
-import java.util.Queue;
import java.util.LinkedList;
Modified:
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java?rev=821348&r1=821347&r2=821348&view=diff
==============================================================================
---
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java
(original)
+++
tomcat/tc5.5.x/trunk/container/modules/groupcom/src/share/org/apache/catalina/tribes/membership/McastService.java
Sat Oct 3 16:08:54 2009
@@ -159,7 +159,9 @@
}
localMember.getData(true, true);
}catch ( IOException x ) {
- throw new IllegalArgumentException(x);
+ IllegalArgumentException iae = new IllegalArgumentException();
+ iae.initCause(x);
+ throw iae;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
