Author: markt
Date: Wed Aug 4 22:45:20 2010
New Revision: 982426
URL: http://svn.apache.org/viewvc?rev=982426&view=rev
Log:
Tried to add GenericWhitespace test - has to be disabled due to a bug
Modified:
tomcat/trunk/checkstyle.xml
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
Modified: tomcat/trunk/checkstyle.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/checkstyle.xml?rev=982426&r1=982425&r2=982426&view=diff
==============================================================================
--- tomcat/trunk/checkstyle.xml (original)
+++ tomcat/trunk/checkstyle.xml Wed Aug 4 22:45:20 2010
@@ -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
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java?rev=982426&r1=982425&r2=982426&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Wed Aug
4 22:45:20 2010
@@ -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();
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java?rev=982426&r1=982425&r2=982426&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
Wed Aug 4 22:45:20 2010
@@ -490,7 +490,7 @@ public final class ApplicationContextFac
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()});
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=982426&r1=982425&r2=982426&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Wed Aug 4
22:45:20 2010
@@ -233,7 +233,7 @@ public abstract class ManagerBase extend
// ------------------------------------------------------------- Security
classes
- private class PrivilegedSetRandomFile implements
PrivilegedAction<DataInputStream>{
+ private class PrivilegedSetRandomFile implements
PrivilegedAction<DataInputStream> {
public PrivilegedSetRandomFile(String s) {
devRandomSource = s;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
