Author: kkolinko
Date: Wed Dec 10 04:11:30 2014
New Revision: 1644334
URL: http://svn.apache.org/r1644334
Log:
Bug in generic whitespace checks has now been fixed so enabled the test.
Fix a couple of issues the test highlights.
Merged revisions r1644201, r1644203 from tomcat/trunk.
Modified:
tomcat/tc8.0.x/trunk/ (props changed)
tomcat/tc8.0.x/trunk/BUILDING.txt
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
tomcat/tc8.0.x/trunk/res/checkstyle/checkstyle.xml
Propchange: tomcat/tc8.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 10 04:11:30 2014
@@ -1 +1 @@
-/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643054-1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644321
+/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1638720-1638725,1639653,1640010,1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1643002,1643045,1643054-1643055,1643066,1643121,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321
Modified: tomcat/tc8.0.x/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/BUILDING.txt?rev=1644334&r1=1644333&r2=1644334&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/BUILDING.txt (original)
+++ tomcat/tc8.0.x/trunk/BUILDING.txt Wed Dec 10 04:11:30 2014
@@ -267,7 +267,7 @@ You can build them by using the followin
starts, unless "gpg.passphrase" property is set.
2. If building the Windows installer
-
+
If running the build in a UAC enabled environment, building the Windows
installer requires elevated privileges. The simplest way to do this is to
open the command prompt used for the build with the "Run as administrator"
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1644334&r1=1644333&r2=1644334&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Wed
Dec 10 04:11:30 2014
@@ -646,10 +646,10 @@ public abstract class WsFrameBase {
if (Util.isControl(opCode)) {
return false;
} else if (textMessage) {
- return textMsgHandler instanceof MessageHandler.Partial<?>;
+ return textMsgHandler instanceof MessageHandler.Partial;
} else {
// Must be binary
- return binaryMsgHandler instanceof MessageHandler.Partial<?>;
+ return binaryMsgHandler instanceof MessageHandler.Partial;
}
}
Modified: tomcat/tc8.0.x/trunk/res/checkstyle/checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/res/checkstyle/checkstyle.xml?rev=1644334&r1=1644333&r2=1644334&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/res/checkstyle/checkstyle.xml (original)
+++ tomcat/tc8.0.x/trunk/res/checkstyle/checkstyle.xml Wed Dec 10 04:11:30 2014
@@ -76,10 +76,7 @@
-->
<!-- Whitespace -->
- <!-- Can't handle HashMap<String,Class<?>[]>
-
https://sourceforge.net/tracker/?func=detail&aid=3039718&group_id=29721&atid=397078
<module name="GenericWhitespace"/>
- -->
<module name="EmptyForInitializerPad"/>
<module name="EmptyForIteratorPad"/>
<!-- ~ 1200 errors
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
