Author: markt
Date: Tue Dec 9 22:09:34 2014
New Revision: 1644203
URL: http://svn.apache.org/r1644203
Log:
Bug in generic whitespace checks has now been fixed so enabled the test.
Fix a couple of issues the test highlights.
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
tomcat/trunk/res/checkstyle/checkstyle.xml
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java?rev=1644203&r1=1644202&r2=1644203&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsFrameBase.java Tue Dec 9
22:09:34 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/trunk/res/checkstyle/checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/checkstyle.xml?rev=1644203&r1=1644202&r2=1644203&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/checkstyle.xml (original)
+++ tomcat/trunk/res/checkstyle/checkstyle.xml Tue Dec 9 22:09:34 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]
