Tried to add GenericWhitespace test - has to be disabled due to a bug

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@982426 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/checkstyle.xml b/checkstyle.xml
index 5af6d24..d9f8bdf 100644 (file)
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -47,5 +47,11 @@
     Do not use - does not take account of imports required for Javadocs
     <module name="UnusedImports"/>
     -->
+    
+    <!-- Whitespace -->
+    <!-- Can't handle HashMap<String,Class<?>[]>
+    https://sourceforge.net/tracker/?func=detail&aid=3039718&group_id=29721&atid=397078
+    <module name="GenericWhitespace"/>
+    -->
   </module>
 </module>
\ No newline at end of file

diff --git a/java/org/apache/catalina/core/ApplicationContext.java b/java/org/apache/catalina/core/ApplicationContext.java
index bf0f513..ac18056 100644 (file)
--- a/java/org/apache/catalina/core/ApplicationContext.java
+++ b/java/org/apache/catalina/core/ApplicationContext.java
@@ -1042,7 +1042,7 @@ public class ApplicationContext
      *         in web.xml, a web-fragment or annotated with {@link WebListener}.
      */
     public ServletRegistration.Dynamic addServlet(String servletName,
-            Class <? extends Servlet> servletClass)
+            Class<? extends Servlet> servletClass)
     throws IllegalStateException {
 
         return addServlet(servletName, servletClass.getName(), null);
@@ -1430,7 +1430,7 @@ public class ApplicationContext
 
     @Override
     public Map<String, ? extends ServletRegistration> getServletRegistrations() {
-        Map<String, ApplicationServletRegistration > result =
+        Map<String, ApplicationServletRegistration> result =
             new HashMap<String, ApplicationServletRegistration>();
         
         Container[] wrappers = context.findChildren();

diff --git a/java/org/apache/catalina/core/ApplicationContextFacade.java b/java/org/apache/catalina/core/ApplicationContextFacade.java
index aa2993f..9efef69 100644 (file)
--- a/java/org/apache/catalina/core/ApplicationContextFacade.java
+++ b/java/org/apache/catalina/core/ApplicationContextFacade.java
@@ -490,7 +490,7 @@ public final class ApplicationContextFacade
 
 
     public ServletRegistration.Dynamic addServlet(String servletName,
-            Class <? extends Servlet> servletClass) {
+            Class<? extends Servlet> servletClass) {
         if (SecurityUtil.isPackageProtectionEnabled()) {
             return (ServletRegistration.Dynamic) doPrivileged(
                     "addServlet", new Object[]{servletName, servletClass.getName()});

diff --git a/java/org/apache/catalina/session/ManagerBase.java b/java/org/apache/catalina/session/ManagerBase.java
index 749bff0..6174c1b 100644 (file)
--- a/java/org/apache/catalina/session/ManagerBase.java
+++ b/java/org/apache/catalina/session/ManagerBase.java
@@ -233,7 +233,7 @@ public abstract class ManagerBase extends LifecycleMBeanBase
     // ------------------------------------------------------------- Security classes
 
 
-    private class PrivilegedSetRandomFile implements PrivilegedAction<DataInputStream>{
+    private class PrivilegedSetRandomFile implements PrivilegedAction<DataInputStream> {
         
         public PrivilegedSetRandomFile(String s) {
             devRandomSource = s;