Author: kkolinko
Date: Tue Apr 22 15:37:02 2014
New Revision: 1589175
URL: http://svn.apache.org/r1589175
Log:
Merged revisions r1589166, r1589165, r1589170 from tomcat/trunk:
Reviewing r1589103
s/J2EE/JavaEE/ in a message
Correct a typo in changelog
Add changelog entry for Tomcat Native upgrade
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1589165-1589166,1589170
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties?rev=1589175&r1=1589174&r2=1589175&view=diff
==============================================================================
---
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/websocket/LocalStrings.properties
Tue Apr 22 15:37:02 2014
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-asyncChannelGroup.createFail=Unable to create dedicated
AsynchronousChannelGroup for WebSocket clients which is required to prevent
memory leaks in complex class loader environments like J2EE containers
+asyncChannelGroup.createFail=Unable to create dedicated
AsynchronousChannelGroup for WebSocket clients which is required to prevent
memory leaks in complex class loader environments like JavaEE containers
asyncChannelWrapperSecure.closeFail=Failed to close channel cleanly
asyncChannelWrapperSecure.concurrentRead=Concurrent read operations are not
permitted
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=1589175&r1=1589174&r2=1589175&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Apr 22 15:37:02 2014
@@ -99,7 +99,7 @@
<fix>
<bug>56409</bug>: Avoid <code>StackOverflowError</code> on non-Windows
systems if a file named <code>\</code> is encountered when scanning for
- TLDs. (mark)
+ TLDs. (markt)
</fix>
</changelog>
</subsection>
@@ -160,7 +160,7 @@
<fix>
Increase the default maximum size of the executor used by the WebSocket
implementation for call backs associated with asynchronous writes from
- 10 to 200. (markt)
+ 10 to 200. (markt)
</fix>
<add>
Add a warning if the thread group created for WebSocket asynchronous
@@ -199,6 +199,10 @@
one installed by the *.exe installer. Print a warning in case if
neither
server nor client jvm is found by <code>service.bat</code>. (kkolinko)
</fix>
+ <update>
+ <bug>56363</bug>: Update to version 1.1.30 of Tomcat Native library.
+ (schultz)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
