Author: markt
Date: Fri Nov 27 20:29:40 2015
New Revision: 1716914
URL: http://svn.apache.org/viewvc?rev=1716914&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=58658
Correct a regression in 7.0.66 that prevented Tomcat from starting on Java 6
unless the WebSocket JARs (that require Java 7) were removed.
Modified:
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1716914&r1=1716913&r2=1716914&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Fri Nov 27 20:29:40 2015
@@ -675,8 +675,8 @@
<javac sourcepath="" srcdir="java" destdir="${tomcat.classes}"
debug="${compile.debug}"
deprecation="${compile.deprecation}"
- source="1.7"
- target="1.7"
+ source="${compile.source}"
+ target="${compile.target}"
excludes="**/.svn/**"
encoding="ISO-8859-1"
includeAntRuntime="true"
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java?rev=1716914&r1=1716913&r2=1716914&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/WsWebSocketContainer.java
Fri Nov 27 20:29:40 2015
@@ -350,8 +350,7 @@ public class WsWebSocketContainer
"wsWebSocketContainer.proxyConnectFail",
selectedProxy,
Integer.toString(httpResponse.getStatus())));
}
- } catch (TimeoutException | InterruptedException |
ExecutionException |
- EOFException e) {
+ } catch (Exception e) {
if (channel != null) {
channel.close();
}
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1716914&r1=1716913&r2=1716914&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Nov 27 20:29:40 2015
@@ -58,6 +58,15 @@
issues do not "pop up" wrt. others).
-->
<section name="Tomcat 7.0.67 (violetagg)">
+ <subsection name="WebSocket">
+ <changelog>
+ <fix>
+ <bug>58658</bug>: Correct a regression in 7.0.66 that prevented Tomcat
+ from starting on Java 6 unless the WebSocket JARs (that require Java 7)
+ were removed. (markt)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 7.0.66 (violetagg)">
<subsection name="General">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
