Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java Tue May 9 22:22:59 2017 @@ -426,9 +426,7 @@ public abstract class WebappClassLoaderB * the parent first. The default in Tomcat is <code>false</code>. */ public boolean getDelegate() { - - return (this.delegate); - + return this.delegate; } @@ -522,7 +520,7 @@ public abstract class WebappClassLoaderB * @return the clearReferencesStopThreads flag for this Context. */ public boolean getClearReferencesStopThreads() { - return (this.clearReferencesStopThreads); + return this.clearReferencesStopThreads; } @@ -541,7 +539,7 @@ public abstract class WebappClassLoaderB * @return the clearReferencesStopTimerThreads flag for this Context. */ public boolean getClearReferencesStopTimerThreads() { - return (this.clearReferencesStopTimerThreads); + return this.clearReferencesStopTimerThreads; } @@ -560,7 +558,7 @@ public abstract class WebappClassLoaderB * @return the clearReferencesLogFactoryRelease flag for this Context. */ public boolean getClearReferencesLogFactoryRelease() { - return (this.clearReferencesLogFactoryRelease); + return this.clearReferencesLogFactoryRelease; } @@ -581,7 +579,7 @@ public abstract class WebappClassLoaderB * Context. */ public boolean getClearReferencesHttpClientKeepAliveThread() { - return (this.clearReferencesHttpClientKeepAliveThread); + return this.clearReferencesHttpClientKeepAliveThread; } @@ -743,7 +741,7 @@ public abstract class WebappClassLoaderB sb.append(transformer).append("\r\n"); } } - return (sb.toString()); + return sb.toString(); } @@ -849,7 +847,7 @@ public abstract class WebappClassLoaderB } log.debug(" Loaded by " + cl.toString()); } - return (clazz); + return clazz; } @@ -987,7 +985,7 @@ public abstract class WebappClassLoaderB if (url != null) { if (log.isDebugEnabled()) log.debug(" --> Returning '" + url.toString() + "'"); - return (url); + return url; } } @@ -996,7 +994,7 @@ public abstract class WebappClassLoaderB if (url != null) { if (log.isDebugEnabled()) log.debug(" --> Returning '" + url.toString() + "'"); - return (url); + return url; } // (3) Delegate to parent unconditionally if not already attempted @@ -1005,14 +1003,14 @@ public abstract class WebappClassLoaderB if (url != null) { if (log.isDebugEnabled()) log.debug(" --> Returning '" + url.toString() + "'"); - return (url); + return url; } } // (4) Resource was not found if (log.isDebugEnabled()) log.debug(" --> Resource not found, returning null"); - return (null); + return null; } @@ -1105,9 +1103,7 @@ public abstract class WebappClassLoaderB */ @Override public Class<?> loadClass(String name) throws ClassNotFoundException { - - return (loadClass(name, false)); - + return loadClass(name, false); } @@ -1154,7 +1150,7 @@ public abstract class WebappClassLoaderB log.debug(" Returning class from cache"); if (resolve) resolveClass(clazz); - return (clazz); + return clazz; } // (0.1) Check our previously loaded class cache @@ -1164,7 +1160,7 @@ public abstract class WebappClassLoaderB log.debug(" Returning class from cache"); if (resolve) resolveClass(clazz); - return (clazz); + return clazz; } // (0.2) Try loading the class with the system class loader, to prevent @@ -1195,7 +1191,7 @@ public abstract class WebappClassLoaderB if (clazz != null) { if (resolve) resolveClass(clazz); - return (clazz); + return clazz; } } catch (ClassNotFoundException e) { // Ignore @@ -1230,7 +1226,7 @@ public abstract class WebappClassLoaderB log.debug(" Loading class from parent"); if (resolve) resolveClass(clazz); - return (clazz); + return clazz; } } catch (ClassNotFoundException e) { // Ignore @@ -1247,7 +1243,7 @@ public abstract class WebappClassLoaderB log.debug(" Loading class from local repository"); if (resolve) resolveClass(clazz); - return (clazz); + return clazz; } } catch (ClassNotFoundException e) { // Ignore @@ -1264,7 +1260,7 @@ public abstract class WebappClassLoaderB log.debug(" Loading class from parent"); if (resolve) resolveClass(clazz); - return (clazz); + return clazz; } } catch (ClassNotFoundException e) { // Ignore @@ -1308,7 +1304,6 @@ public abstract class WebappClassLoaderB */ @Override protected PermissionCollection getPermissions(CodeSource codeSource) { - String codeUrl = codeSource.getLocation().toString(); PermissionCollection pc; if ((pc = loaderPC.get(codeUrl)) == null) { @@ -1322,8 +1317,7 @@ public abstract class WebappClassLoaderB loaderPC.put(codeUrl,pc); } } - return (pc); - + return pc; }
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original) +++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Tue May 9 22:22:59 2017 @@ -224,7 +224,7 @@ public class WebappLoader extends Lifecy * @return the ClassLoader class name. */ public String getLoaderClass() { - return (this.loaderClass); + return this.loaderClass; } Modified: tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java Tue May 9 22:22:59 2017 @@ -231,9 +231,7 @@ public class ManagerServlet extends Http */ @Override public Wrapper getWrapper() { - - return (this.wrapper); - + return this.wrapper; } Modified: tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java Tue May 9 22:22:59 2017 @@ -947,7 +947,7 @@ public class StatusTransformer { result.append(content[i]); } } - return (result.toString()); + return result.toString(); } Modified: tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java Tue May 9 22:22:59 2017 @@ -141,9 +141,7 @@ public class HostManagerServlet */ @Override public Wrapper getWrapper() { - - return (this.wrapper); - + return this.wrapper; } Modified: tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java (original) +++ tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java Tue May 9 22:22:59 2017 @@ -1449,7 +1449,6 @@ public final class Mapper { * Find the position of the last slash in the given char chunk. */ private static final int lastSlash(CharChunk name) { - char[] c = name.getBuffer(); int end = name.getEnd(); int start = name.getStart(); @@ -1461,8 +1460,7 @@ public final class Mapper { } } - return (pos); - + return pos; } @@ -1470,7 +1468,6 @@ public final class Mapper { * Find the position of the nth slash, in the given char chunk. */ private static final int nthSlash(CharChunk name, int n) { - char[] c = name.getBuffer(); int end = name.getEnd(); int start = name.getStart(); @@ -1484,8 +1481,7 @@ public final class Mapper { } } - return (pos); - + return pos; } Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java Tue May 9 22:22:59 2017 @@ -75,13 +75,13 @@ public class ContextResourceLinkMBean ex String value = null; if ("global".equals(name)) { - return (cl.getGlobal()); + return cl.getGlobal(); } else if ("description".equals(name)) { - return (cl.getDescription()); + return cl.getDescription(); } else if ("name".equals(name)) { - return (cl.getName()); + return cl.getName(); } else if ("type".equals(name)) { - return (cl.getType()); + return cl.getType(); } else { value = (String) cl.getProperty(name); if (value == null) { Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java Tue May 9 22:22:59 2017 @@ -74,15 +74,15 @@ public class ContextResourceMBean extend String value = null; if ("auth".equals(name)) { - return (cr.getAuth()); + return cr.getAuth(); } else if ("description".equals(name)) { - return (cr.getDescription()); + return cr.getDescription(); } else if ("name".equals(name)) { - return (cr.getName()); + return cr.getName(); } else if ("scope".equals(name)) { - return (cr.getScope()); + return cr.getScope(); } else if ("type".equals(name)) { - return (cr.getType()); + return cr.getType(); } else { value = (String) cr.getProperty(name); if (value == null) { Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java Tue May 9 22:22:59 2017 @@ -247,7 +247,7 @@ public class MBeanFactory { oname = ((JmxEnabled) realm).getObjectName(); } if (oname != null) { - return (oname.toString()); + return oname.toString(); } else { return null; } @@ -303,7 +303,7 @@ public class MBeanFactory { // Return the corresponding MBean name ObjectName coname = retobj.getObjectName(); - return (coname.toString()); + return coname.toString(); } @@ -515,7 +515,7 @@ public class MBeanFactory { engine.addChild(host); // Return the corresponding MBean name - return (host.getObjectName().toString()); + return host.getObjectName().toString(); } @@ -576,7 +576,7 @@ public class MBeanFactory { } ObjectName oname = manager.getObjectName(); if (oname != null) { - return (oname.toString()); + return oname.toString(); } else { return null; } @@ -667,7 +667,7 @@ public class MBeanFactory { //ObjectName oname = loader.getObjectName(); ObjectName oname = MBeanUtils.createObjectName(pname.getDomain(), loader); - return (oname.toString()); + return oname.toString(); } Modified: tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java (original) +++ tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java Tue May 9 22:22:59 2017 @@ -91,7 +91,7 @@ public class MBeanUtils { String className = component.getClass().getName(); for (int i = 0; i < exceptions.length; i++) { if (className.equals(exceptions[i][0])) { - return (exceptions[i][1]); + return exceptions[i][1]; } } @@ -99,7 +99,7 @@ public class MBeanUtils { int period = className.lastIndexOf('.'); if (period >= 0) className = className.substring(period + 1); - return (className); + return className; } @@ -130,7 +130,7 @@ public class MBeanUtils { mserver.unregisterMBean(oname); } mserver.registerMBean(mbean, oname); - return (mbean); + return mbean; } @@ -161,7 +161,7 @@ public class MBeanUtils { mserver.unregisterMBean(oname); } mserver.registerMBean(mbean, oname); - return (mbean); + return mbean; } @@ -192,7 +192,7 @@ public class MBeanUtils { mserver.unregisterMBean(oname); } mserver.registerMBean(mbean, oname); - return (mbean); + return mbean; } @@ -223,7 +223,7 @@ public class MBeanUtils { mserver.unregisterMBean(oname); } mserver.registerMBean(mbean, oname); - return (mbean); + return mbean; } @@ -254,7 +254,7 @@ public class MBeanUtils { mserver.unregisterMBean(oname); } mserver.registerMBean(mbean, oname); - return (mbean); + return mbean; } @@ -285,7 +285,7 @@ public class MBeanUtils { mserver.unregisterMBean(oname); } mserver.registerMBean(mbean, oname); - return (mbean); + return mbean; } @@ -316,7 +316,7 @@ public class MBeanUtils { mserver.unregisterMBean(oname); } mserver.registerMBean(mbean, oname); - return (mbean); + return mbean; } @@ -349,7 +349,7 @@ public class MBeanUtils { ",context=" + cn.getDisplayName() + ",name=" + environment.getName()); } - return (name); + return name; } @@ -386,7 +386,7 @@ public class MBeanUtils { ",name=" + quotedResourceName); } - return (name); + return name; } @@ -423,7 +423,7 @@ public class MBeanUtils { ",name=" + quotedResourceLinkName); } - return (name); + return name; } @@ -445,7 +445,7 @@ public class MBeanUtils { name = new ObjectName(domain + ":type=Group,groupname=" + ObjectName.quote(group.getGroupname()) + ",database=" + group.getUserDatabase().getId()); - return (name); + return name; } @@ -528,7 +528,7 @@ public class MBeanUtils { ObjectName name = null; name = new ObjectName(domain + ":type=UserDatabase,database=" + userDatabase.getId()); - return (name); + return name; } @@ -538,7 +538,6 @@ public class MBeanUtils { * @return the singleton registry */ public static synchronized Registry createRegistry() { - if (registry == null) { registry = Registry.getRegistry(null, null); ClassLoader cl = MBeanUtils.class.getClassLoader(); @@ -559,8 +558,7 @@ public class MBeanUtils { registry.loadDescriptors("org.apache.catalina.storeconfig", cl); registry.loadDescriptors("org.apache.tomcat.util.descriptor.web", cl); } - return (registry); - + return registry; } @@ -571,12 +569,10 @@ public class MBeanUtils { * @return the singleton MBean server */ public static synchronized MBeanServer createServer() { - if (mserver == null) { mserver = Registry.getRegistry(null, null).getMBeanServer(); } - return (mserver); - + return mserver; } Modified: tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java (original) +++ tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java Tue May 9 22:22:59 2017 @@ -456,9 +456,9 @@ public class DataSourceRealm extends Rea return new GenericPrincipal(username, null, null); } try { - return (new GenericPrincipal(username, + return new GenericPrincipal(username, getPassword(dbConnection, username), - getRoles(dbConnection, username))); + getRoles(dbConnection, username)); } finally { close(dbConnection); } @@ -540,7 +540,7 @@ public class DataSourceRealm extends Rea dbConnection.prepareStatement(preparedCredentials); credentials.setString(1, username); - return (credentials); + return credentials; } @@ -560,7 +560,7 @@ public class DataSourceRealm extends Rea dbConnection.prepareStatement(preparedRoles); roles.setString(1, username); - return (roles); + return roles; } Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original) +++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Tue May 9 22:22:59 2017 @@ -247,7 +247,7 @@ public class JAASRealm extends RealmBase protected String roleClassNames = null; public String getRoleClassNames() { - return (this.roleClassNames); + return this.roleClassNames; } /** @@ -303,7 +303,7 @@ public class JAASRealm extends RealmBase protected String userClassNames = null; public String getUserClassNames() { - return (this.userClassNames); + return this.userClassNames; } /** @@ -401,7 +401,7 @@ public class JAASRealm extends RealmBase } catch (Throwable e) { ExceptionUtils.handleThrowable(e); log.error(sm.getString("jaasRealm.unexpectedError"), e); - return (null); + return null; } finally { if(!isUseContextClassLoader()) { Thread.currentThread().setContextClassLoader(ocl); @@ -419,27 +419,27 @@ public class JAASRealm extends RealmBase if (subject == null) { if( log.isDebugEnabled()) log.debug(sm.getString("jaasRealm.failedLogin", username)); - return (null); + return null; } } catch (AccountExpiredException e) { if (log.isDebugEnabled()) log.debug(sm.getString("jaasRealm.accountExpired", username)); - return (null); + return null; } catch (CredentialExpiredException e) { if (log.isDebugEnabled()) log.debug(sm.getString("jaasRealm.credentialExpired", username)); - return (null); + return null; } catch (FailedLoginException e) { if (log.isDebugEnabled()) log.debug(sm.getString("jaasRealm.failedLogin", username)); - return (null); + return null; } catch (LoginException e) { log.warn(sm.getString("jaasRealm.loginException", username), e); - return (null); + return null; } catch (Throwable e) { ExceptionUtils.handleThrowable(e); log.error(sm.getString("jaasRealm.unexpectedError"), e); - return (null); + return null; } if( log.isDebugEnabled()) @@ -449,13 +449,13 @@ public class JAASRealm extends RealmBase Principal principal = createPrincipal(username, subject, loginContext); if (principal == null) { log.debug(sm.getString("jaasRealm.authenticateFailure", username)); - return (null); + return null; } if (log.isDebugEnabled()) { log.debug(sm.getString("jaasRealm.authenticateSuccess", username)); } - return (principal); + return principal; } catch( Throwable t) { log.error( "error ", t); return null; @@ -470,9 +470,7 @@ public class JAASRealm extends RealmBase */ @Override protected String getPassword(String username) { - - return (null); - + return null; } Modified: tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java (original) +++ tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Tue May 9 22:22:59 2017 @@ -322,7 +322,7 @@ public class JDBCRealm // Return the Principal (if any) - return (principal); + return principal; } catch (SQLException e) { @@ -404,7 +404,7 @@ public class JDBCRealm ArrayList<String> roles = getRoles(username); // Create and return a suitable Principal for this user - return (new GenericPrincipal(username, credentials, roles)); + return new GenericPrincipal(username, credentials, roles); } @@ -490,7 +490,7 @@ public class JDBCRealm preparedCredentials.setString(1, username); } - return (preparedCredentials); + return preparedCredentials; } @@ -557,9 +557,9 @@ public class JDBCRealm @Override protected synchronized Principal getPrincipal(String username) { - return (new GenericPrincipal(username, + return new GenericPrincipal(username, getPassword(username), - getRoles(username))); + getRoles(username)); } @@ -633,7 +633,7 @@ public class JDBCRealm // Do nothing if there is a database connection already open if (dbConnection != null) - return (dbConnection); + return dbConnection; // Instantiate our database driver if necessary if (driver == null) { @@ -658,7 +658,7 @@ public class JDBCRealm "jdbcRealm.open.invalidurl",driverName, connectionURL)); } dbConnection.setAutoCommit(false); - return (dbConnection); + return dbConnection; } @@ -689,7 +689,7 @@ public class JDBCRealm } preparedRoles.setString(1, username); - return (preparedRoles); + return preparedRoles; } Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java (original) +++ tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java Tue May 9 22:22:59 2017 @@ -1349,7 +1349,7 @@ public class JNDIRealm extends RealmBase if (containerLog.isDebugEnabled()) { containerLog.debug("Found roles: " + roles.toString()); } - return (new GenericPrincipal(username, credentials, roles)); + return new GenericPrincipal(username, credentials, roles); } } catch (InvalidNameException ine) { // Log the problem for posterity Modified: tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java (original) +++ tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java Tue May 9 22:22:59 2017 @@ -182,7 +182,6 @@ public class MemoryRealm extends RealmB * the XML input file, creating a new one if necessary. */ protected synchronized Digester getDigester() { - if (digester == null) { digester = new Digester(); digester.setValidating(false); @@ -195,8 +194,7 @@ public class MemoryRealm extends RealmB } digester.addRuleSet(new MemoryRuleSet()); } - return (digester); - + return digester; } @@ -208,9 +206,9 @@ public class MemoryRealm extends RealmB GenericPrincipal principal = principals.get(username); if (principal != null) { - return (principal.getPassword()); + return principal.getPassword(); } else { - return (null); + return null; } } Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Tue May 9 22:22:59 2017 @@ -191,9 +191,7 @@ public abstract class RealmBase extends */ @Override public Container getContainer() { - - return (container); - + return container; } @@ -446,7 +444,7 @@ public abstract class RealmBase extends public Principal authenticate(X509Certificate certs[]) { if ((certs == null) || (certs.length < 1)) - return (null); + return null; // Check the validity of each certificate in the chain if (log.isDebugEnabled()) @@ -461,14 +459,13 @@ public abstract class RealmBase extends } catch (Exception e) { if (log.isDebugEnabled()) log.debug(" Validity exception", e); - return (null); + return null; } } } // Check the existence of the client Principal in our database - return (getPrincipal(certs[0])); - + return getPrincipal(certs[0]); } @@ -546,7 +543,7 @@ public abstract class RealmBase extends if ((constraints == null) || (constraints.length == 0)) { if (log.isDebugEnabled()) log.debug(" No applicable constraints defined"); - return (null); + return null; } // Check each defined security constraint Modified: tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java (original) +++ tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java Tue May 9 22:22:59 2017 @@ -154,15 +154,13 @@ public class UserDatabaseRealm */ @Override protected String getPassword(String username) { - User user = database.findUser(username); if (user == null) { return null; } - return (user.getPassword()); - + return user.getPassword(); } Modified: tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java (original) +++ tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java Tue May 9 22:22:59 2017 @@ -1520,7 +1520,7 @@ public class DefaultServlet extends Http StreamResult out = new StreamResult(osWriter); transformer.transform(xmlSource, out); osWriter.flush(); - return (new ByteArrayInputStream(stream.toByteArray())); + return new ByteArrayInputStream(stream.toByteArray()); } catch (TransformerException e) { throw new ServletException("XSL transformer error", e); } finally { @@ -1681,7 +1681,7 @@ public class DefaultServlet extends Http // Return an input stream to the underlying bytes writer.write(sb.toString()); writer.flush(); - return (new ByteArrayInputStream(stream.toByteArray())); + return new ByteArrayInputStream(stream.toByteArray()); } Modified: tomcat/trunk/java/org/apache/catalina/session/FileStore.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/FileStore.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/session/FileStore.java (original) +++ tomcat/trunk/java/org/apache/catalina/session/FileStore.java Tue May 9 22:22:59 2017 @@ -173,14 +173,14 @@ public final class FileStore extends Sto // Acquire the list of files in our storage directory File file = directory(); if (file == null) { - return (new String[0]); + return new String[0]; } String files[] = file.list(); // Bugzilla 32130 if((files == null) || (files.length < 1)) { - return (new String[0]); + return new String[0]; } // Build and return the list of session identifiers 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=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Tue May 9 22:22:59 2017 @@ -401,18 +401,14 @@ public abstract class ManagerBase extend * @return The descriptive short name of this Manager implementation. */ public String getName() { - - return (name); - + return name; } /** * @return The secure random number generator class name. */ public String getSecureRandomClass() { - - return (this.secureRandomClass); - + return this.secureRandomClass; } @@ -500,9 +496,7 @@ public abstract class ManagerBase extend * @return The frequency of manager checks. */ public int getProcessExpiresFrequency() { - - return (this.processExpiresFrequency); - + return this.processExpiresFrequency; } /** @@ -671,14 +665,13 @@ public abstract class ManagerBase extend sessionCreationTiming.add(timing); sessionCreationTiming.poll(); } - return (session); - + return session; } @Override public Session createEmptySession() { - return (getNewSession()); + return getNewSession(); } @@ -922,9 +915,7 @@ public abstract class ManagerBase extend * limit. */ public int getMaxActiveSessions() { - - return (this.maxActiveSessions); - + return this.maxActiveSessions; } Modified: tomcat/trunk/java/org/apache/catalina/session/StandardSession.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardSession.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/session/StandardSession.java (original) +++ tomcat/trunk/java/org/apache/catalina/session/StandardSession.java Tue May 9 22:22:59 2017 @@ -279,9 +279,7 @@ public class StandardSession implements */ @Override public String getAuthType() { - - return (this.authType); - + return this.authType; } @@ -293,11 +291,9 @@ public class StandardSession implements */ @Override public void setAuthType(String authType) { - String oldAuthType = this.authType; this.authType = authType; support.firePropertyChange("authType", oldAuthType, this.authType); - } @@ -322,9 +318,7 @@ public class StandardSession implements */ @Override public String getId() { - - return (this.id); - + return this.id; } @@ -333,9 +327,7 @@ public class StandardSession implements */ @Override public String getIdInternal() { - - return (this.id); - + return this.id; } @@ -471,7 +463,7 @@ public class StandardSession implements (sm.getString("standardSession.getThisAccessedTime.ise")); } - return (this.thisAccessedTime); + return this.thisAccessedTime; } /** @@ -480,7 +472,7 @@ public class StandardSession implements */ @Override public long getThisAccessedTimeInternal() { - return (this.thisAccessedTime); + return this.thisAccessedTime; } /** @@ -498,7 +490,7 @@ public class StandardSession implements (sm.getString("standardSession.getLastAccessedTime.ise")); } - return (this.lastAccessedTime); + return this.lastAccessedTime; } /** @@ -507,7 +499,7 @@ public class StandardSession implements */ @Override public long getLastAccessedTimeInternal() { - return (this.lastAccessedTime); + return this.lastAccessedTime; } /** @@ -567,9 +559,7 @@ public class StandardSession implements */ @Override public int getMaxInactiveInterval() { - - return (this.maxInactiveInterval); - + return this.maxInactiveInterval; } @@ -593,9 +583,7 @@ public class StandardSession implements */ @Override public void setNew(boolean isNew) { - this.isNew = isNew; - } @@ -608,9 +596,7 @@ public class StandardSession implements */ @Override public Principal getPrincipal() { - - return (this.principal); - + return this.principal; } @@ -952,9 +938,7 @@ public class StandardSession implements */ @Override public Object getNote(String name) { - - return (notes.get(name)); - + return notes.get(name); } @@ -964,9 +948,7 @@ public class StandardSession implements */ @Override public Iterator<String> getNoteNames() { - - return (notes.keySet().iterator()); - + return notes.keySet().iterator(); } @@ -1039,13 +1021,11 @@ public class StandardSession implements */ @Override public String toString() { - StringBuilder sb = new StringBuilder(); sb.append("StandardSession["); sb.append(id); sb.append("]"); - return (sb.toString()); - + return sb.toString(); } @@ -1099,13 +1079,11 @@ public class StandardSession implements */ @Override public long getCreationTime() { - if (!isValidInternal()) throw new IllegalStateException (sm.getString("standardSession.getCreationTime.ise")); - return (this.creationTime); - + return this.creationTime; } @@ -1142,11 +1120,9 @@ public class StandardSession implements @Override @Deprecated public javax.servlet.http.HttpSessionContext getSessionContext() { - if (sessionContext == null) sessionContext = new StandardSessionContext(); - return (sessionContext); - + return sessionContext; } @@ -1164,15 +1140,13 @@ public class StandardSession implements */ @Override public Object getAttribute(String name) { - if (!isValidInternal()) throw new IllegalStateException (sm.getString("standardSession.getAttribute.ise")); if (name == null) return null; - return (attributes.get(name)); - + return attributes.get(name); } @@ -1212,7 +1186,7 @@ public class StandardSession implements @Deprecated public Object getValue(String name) { - return (getAttribute(name)); + return getAttribute(name); } @@ -1230,13 +1204,11 @@ public class StandardSession implements @Override @Deprecated public String[] getValueNames() { - if (!isValidInternal()) throw new IllegalStateException (sm.getString("standardSession.getValueNames.ise")); - return (keys()); - + return keys(); } @@ -1271,13 +1243,11 @@ public class StandardSession implements */ @Override public boolean isNew() { - if (!isValidInternal()) throw new IllegalStateException (sm.getString("standardSession.isNew.ise")); - return (this.isNew); - + return this.isNew; } @@ -1910,6 +1880,6 @@ final class StandardSessionContext @Override @Deprecated public HttpSession getSession(String id) { - return (null); + return null; } } Modified: tomcat/trunk/java/org/apache/catalina/ssi/SSIServletRequestUtil.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ssi/SSIServletRequestUtil.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/ssi/SSIServletRequestUtil.java (original) +++ tomcat/trunk/java/org/apache/catalina/ssi/SSIServletRequestUtil.java Tue May 9 22:22:59 2017 @@ -41,7 +41,7 @@ public class SSIServletRequestUtil { result = (String)request.getAttribute( RequestDispatcher.INCLUDE_SERVLET_PATH); if ((result == null) || (result.equals(""))) result = "/"; - return (result); + return result; } // No, extract the desired path directly from the request String result = request.getPathInfo(); Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Tue May 9 22:22:59 2017 @@ -162,7 +162,7 @@ public class Catalina { public ClassLoader getParentClassLoader() { if (parentClassLoader != null) { - return (parentClassLoader); + return parentClassLoader; } return ClassLoader.getSystemClassLoader(); } @@ -181,7 +181,7 @@ public class Catalina { * @return <code>true</code> if naming is enabled. */ public boolean isUseNaming() { - return (this.useNaming); + return this.useNaming; } @@ -257,7 +257,7 @@ public class Catalina { if (!file.isAbsolute()) { file = new File(Bootstrap.getCatalinaBase(), configFile); } - return (file); + return file; } @@ -386,7 +386,7 @@ public class Catalina { if (log.isDebugEnabled()) { log.debug("Digester for server.xml created " + ( t2-t1 )); } - return (digester); + return digester; } @@ -431,7 +431,7 @@ public class Catalina { "setServer", "org.apache.catalina.Server"); - return (digester); + return digester; } Modified: tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java Tue May 9 22:22:59 2017 @@ -100,7 +100,7 @@ public class ExpandWar { if (!warTracker.exists() || warTracker.lastModified() == warLastModified) { // No (detectable) changes to the WAR success = true; - return (docBase.getAbsolutePath()); + return docBase.getAbsolutePath(); } // WAR must have been modified. Remove expanded directory. Modified: tomcat/trunk/java/org/apache/catalina/startup/HomesUserDatabase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HomesUserDatabase.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/HomesUserDatabase.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/HomesUserDatabase.java Tue May 9 22:22:59 2017 @@ -71,9 +71,7 @@ public final class HomesUserDatabase */ @Override public UserConfig getUserConfig() { - - return (this.userConfig); - + return this.userConfig; } @@ -84,10 +82,8 @@ public final class HomesUserDatabase */ @Override public void setUserConfig(UserConfig userConfig) { - this.userConfig = userConfig; init(); - } @@ -101,9 +97,7 @@ public final class HomesUserDatabase */ @Override public String getHome(String user) { - return homes.get(user); - } @@ -112,9 +106,7 @@ public final class HomesUserDatabase */ @Override public Enumeration<String> getUsers() { - - return (homes.keys()); - + return homes.keys(); } Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue May 9 22:22:59 2017 @@ -160,9 +160,7 @@ public class HostConfig implements Lifec * @return the Context implementation class name. */ public String getContextClass() { - - return (this.contextClass); - + return this.contextClass; } @@ -188,9 +186,7 @@ public class HostConfig implements Lifec * @return the deploy XML config file flag for this component. */ public boolean isDeployXML() { - - return (this.deployXML); - + return this.deployXML; } @@ -200,9 +196,7 @@ public class HostConfig implements Lifec * @param deployXML The new deploy XML flag */ public void setDeployXML(boolean deployXML) { - this.deployXML= deployXML; - } @@ -210,9 +204,7 @@ public class HostConfig implements Lifec * @return the copy XML config file flag for this component. */ public boolean isCopyXML() { - - return (this.copyXML); - + return this.copyXML; } @@ -232,9 +224,7 @@ public class HostConfig implements Lifec * @return the unpack WARs flag. */ public boolean isUnpackWARs() { - - return (this.unpackWARs); - + return this.unpackWARs; } @@ -244,9 +234,7 @@ public class HostConfig implements Lifec * @param unpackWARs The new unpack WARs flag */ public void setUnpackWARs(boolean unpackWARs) { - this.unpackWARs = unpackWARs; - } @@ -303,7 +291,7 @@ public class HostConfig implements Lifec * @return state of the application */ public synchronized boolean isServiced(String name) { - return (serviced.contains(name)); + return serviced.contains(name); } @@ -367,7 +355,7 @@ public class HostConfig implements Lifec // Set the properties on that object (it doesn't matter if extra // properties are set) digester.addSetProperties("Context"); - return (digester); + return digester; } protected File returnCanonicalPath(String path) { Modified: tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java Tue May 9 22:22:59 2017 @@ -112,15 +112,13 @@ public class SetNextNamingRule extends R */ @Override public String toString() { - StringBuilder sb = new StringBuilder("SetNextRule["); sb.append("methodName="); sb.append(methodName); sb.append(", paramType="); sb.append(paramType); sb.append("]"); - return (sb.toString()); - + return sb.toString(); } Modified: tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java (original) +++ tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java Tue May 9 22:22:59 2017 @@ -116,9 +116,7 @@ public final class UserConfig * @return the Context configuration class name. */ public String getConfigClass() { - - return (this.configClass); - + return this.configClass; } @@ -128,9 +126,7 @@ public final class UserConfig * @param configClass The new Context configuration class name. */ public void setConfigClass(String configClass) { - this.configClass = configClass; - } @@ -138,9 +134,7 @@ public final class UserConfig * @return the Context implementation class name. */ public String getContextClass() { - - return (this.contextClass); - + return this.contextClass; } @@ -150,9 +144,7 @@ public final class UserConfig * @param contextClass The new Context implementation class name. */ public void setContextClass(String contextClass) { - this.contextClass = contextClass; - } @@ -160,9 +152,7 @@ public final class UserConfig * @return the directory name for user web applications. */ public String getDirectoryName() { - - return (this.directoryName); - + return this.directoryName; } @@ -172,9 +162,7 @@ public final class UserConfig * @param directoryName The new directory name */ public void setDirectoryName(String directoryName) { - this.directoryName = directoryName; - } @@ -182,9 +170,7 @@ public final class UserConfig * @return the base directory containing user home directories. */ public String getHomeBase() { - - return (this.homeBase); - + return this.homeBase; } @@ -194,9 +180,7 @@ public final class UserConfig * @param homeBase The new base directory */ public void setHomeBase(String homeBase) { - this.homeBase = homeBase; - } @@ -204,9 +188,7 @@ public final class UserConfig * @return the user database class name for this component. */ public String getUserClass() { - - return (this.userClass); - + return this.userClass; } @@ -215,9 +197,7 @@ public final class UserConfig * @param userClass The user database class name */ public void setUserClass(String userClass) { - this.userClass = userClass; - } /** Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java (original) +++ tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java Tue May 9 22:22:59 2017 @@ -277,7 +277,7 @@ public class ConnectorStoreAppender exte boolean isPrint = super.isPrintValue(bean, bean2, attrName, desc); if (isPrint) { if ("jkHome".equals(attrName)) { - Connector connector = ((Connector) bean); + Connector connector = (Connector) bean; File catalinaBase = getCatalinaBase(); File jkHomeBase = getJkHomeBase((String) connector .getProperty("jkHome"), catalinaBase); @@ -295,7 +295,7 @@ public class ConnectorStoreAppender exte file = file.getCanonicalFile(); } catch (IOException e) { } - return (file); + return file; } protected File getJkHomeBase(String jkHome, File appBase) { @@ -309,7 +309,7 @@ public class ConnectorStoreAppender exte } catch (IOException e) { jkHomeBase = file; } - return (jkHomeBase); + return jkHomeBase; } } \ No newline at end of file Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java (original) +++ tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java Tue May 9 22:22:59 2017 @@ -320,7 +320,7 @@ public class StandardContextSF extends S log.error(e); } } - return (file); + return file; } Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java (original) +++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java Tue May 9 22:22:59 2017 @@ -383,7 +383,7 @@ public class StoreAppender { filtered.append(c); } } - return (filtered.toString()); + return filtered.toString(); } /** Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreContextAppender.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreContextAppender.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreContextAppender.java (original) +++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreContextAppender.java Tue May 9 22:22:59 2017 @@ -93,12 +93,11 @@ public class StoreContextAppender extend } catch (IOException e) { appBase = file; } - return (appBase); + return appBase; } protected File getDocBase(StandardContext context, File appBase) { - File docBase; String contextDocBase = context.getOriginalDocBase() ; if(contextDocBase == null) @@ -111,8 +110,7 @@ public class StoreContextAppender extend } catch (IOException e) { docBase = file; } - return (docBase); - + return docBase; } /** Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryBase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryBase.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryBase.java (original) +++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryBase.java Tue May 9 22:22:59 2017 @@ -52,9 +52,7 @@ public class StoreFactoryBase implements * <code><description>/<version></code>. */ public String getInfo() { - - return (info); - + return info; } /** Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java (original) +++ tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java Tue May 9 22:22:59 2017 @@ -135,7 +135,7 @@ public class StoreLoader { long t2 = System.currentTimeMillis(); if (log.isDebugEnabled()) log.debug("Digester for server-registry.xml created " + (t2 - t1)); - return (digester); + return digester; } @@ -159,7 +159,7 @@ public class StoreLoader { } catch (IOException e) { log.error(e); } - return (file); + return file; } /** Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/RxTaskPool.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/RxTaskPool.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/RxTaskPool.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/RxTaskPool.java Tue May 9 22:22:59 2017 @@ -86,7 +86,7 @@ public class RxTaskPool { }//while if ( worker != null ) used.add(worker); } - return (worker); + return worker; } public int available() { Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java Tue May 9 22:22:59 2017 @@ -173,7 +173,7 @@ public class BioSender extends AbstractS SenderState.getSenderState(getDestination()).setSuspect(); if (log.isDebugEnabled()) log.debug(sm.getString("bioSender.openSocket.failure",getAddress().getHostAddress(), Integer.valueOf(getPort()), Long.valueOf(0)), ex1); - throw (ex1); + throw ex1; } } Modified: tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java (original) +++ tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java Tue May 9 22:22:59 2017 @@ -336,7 +336,7 @@ public class NioSender extends AbstractS } private ByteBuffer getBuffer(int size) { - return (getDirectBuffer()?ByteBuffer.allocateDirect(size):ByteBuffer.allocate(size)); + return getDirectBuffer()?ByteBuffer.allocateDirect(size):ByteBuffer.allocate(size); } /** Modified: tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java (original) +++ tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java Tue May 9 22:22:59 2017 @@ -59,9 +59,7 @@ public abstract class AbstractGroup impl */ @Override public String getDescription() { - - return (this.description); - + return this.description; } @@ -72,9 +70,7 @@ public abstract class AbstractGroup impl */ @Override public void setDescription(String description) { - this.description = description; - } @@ -84,9 +80,7 @@ public abstract class AbstractGroup impl */ @Override public String getGroupname() { - - return (this.groupname); - + return this.groupname; } @@ -98,9 +92,7 @@ public abstract class AbstractGroup impl */ @Override public void setGroupname(String groupname) { - this.groupname = groupname; - } @@ -171,9 +163,7 @@ public abstract class AbstractGroup impl */ @Override public String getName() { - - return (getGroupname()); - + return getGroupname(); } Modified: tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java (original) +++ tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java Tue May 9 22:22:59 2017 @@ -55,9 +55,7 @@ public abstract class AbstractRole imple */ @Override public String getDescription() { - - return (this.description); - + return this.description; } @@ -68,9 +66,7 @@ public abstract class AbstractRole imple */ @Override public void setDescription(String description) { - this.description = description; - } @@ -80,9 +76,7 @@ public abstract class AbstractRole imple */ @Override public String getRolename() { - - return (this.rolename); - + return this.rolename; } @@ -94,9 +88,7 @@ public abstract class AbstractRole imple */ @Override public void setRolename(String rolename) { - this.rolename = rolename; - } @@ -118,9 +110,7 @@ public abstract class AbstractRole imple */ @Override public String getName() { - - return (getRolename()); - + return getRolename(); } Modified: tomcat/trunk/java/org/apache/catalina/users/AbstractUser.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/AbstractUser.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/users/AbstractUser.java (original) +++ tomcat/trunk/java/org/apache/catalina/users/AbstractUser.java Tue May 9 22:22:59 2017 @@ -64,9 +64,7 @@ public abstract class AbstractUser imple */ @Override public String getFullName() { - - return (this.fullName); - + return this.fullName; } @@ -77,9 +75,7 @@ public abstract class AbstractUser imple */ @Override public void setFullName(String fullName) { - this.fullName = fullName; - } @@ -97,9 +93,7 @@ public abstract class AbstractUser imple */ @Override public String getPassword() { - - return (this.password); - + return this.password; } @@ -112,9 +106,7 @@ public abstract class AbstractUser imple */ @Override public void setPassword(String password) { - this.password = password; - } @@ -131,9 +123,7 @@ public abstract class AbstractUser imple */ @Override public String getUsername() { - - return (this.username); - + return this.username; } @@ -145,9 +135,7 @@ public abstract class AbstractUser imple */ @Override public void setUsername(String username) { - this.username = username; - } @@ -232,9 +220,7 @@ public abstract class AbstractUser imple */ @Override public String getName() { - - return (getUsername()); - + return getUsername(); } Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java (original) +++ tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java Tue May 9 22:22:59 2017 @@ -83,11 +83,9 @@ public class MemoryGroup extends Abstrac */ @Override public Iterator<Role> getRoles() { - synchronized (roles) { - return (roles.iterator()); + return roles.iterator(); } - } @@ -96,9 +94,7 @@ public class MemoryGroup extends Abstrac */ @Override public UserDatabase getUserDatabase() { - - return (this.database); - + return this.database; } @@ -107,7 +103,6 @@ public class MemoryGroup extends Abstrac */ @Override public Iterator<User> getUsers() { - ArrayList<User> results = new ArrayList<>(); Iterator<User> users = database.getUsers(); while (users.hasNext()) { @@ -116,8 +111,7 @@ public class MemoryGroup extends Abstrac results.add(user); } } - return (results.iterator()); - + return results.iterator(); } @@ -131,13 +125,11 @@ public class MemoryGroup extends Abstrac */ @Override public void addRole(Role role) { - synchronized (roles) { if (!roles.contains(role)) { roles.add(role); } } - } @@ -148,11 +140,9 @@ public class MemoryGroup extends Abstrac */ @Override public boolean isInRole(Role role) { - synchronized (roles) { - return (roles.contains(role)); + return roles.contains(role); } - } @@ -163,11 +153,9 @@ public class MemoryGroup extends Abstrac */ @Override public void removeRole(Role role) { - synchronized (roles) { roles.remove(role); } - } @@ -176,11 +164,9 @@ public class MemoryGroup extends Abstrac */ @Override public void removeRoles() { - synchronized (roles) { roles.clear(); } - } @@ -189,7 +175,6 @@ public class MemoryGroup extends Abstrac */ @Override public String toString() { - StringBuilder sb = new StringBuilder("<group groupname=\""); sb.append(groupname); sb.append("\""); @@ -206,6 +191,6 @@ public class MemoryGroup extends Abstrac } } sb.append("/>"); - return (sb.toString()); + return sb.toString(); } } Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryRole.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryRole.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/users/MemoryRole.java (original) +++ tomcat/trunk/java/org/apache/catalina/users/MemoryRole.java Tue May 9 22:22:59 2017 @@ -71,9 +71,7 @@ public class MemoryRole extends Abstract */ @Override public UserDatabase getUserDatabase() { - - return (this.database); - + return this.database; } @@ -85,7 +83,6 @@ public class MemoryRole extends Abstract */ @Override public String toString() { - StringBuilder sb = new StringBuilder("<role rolename=\""); sb.append(rolename); sb.append("\""); @@ -95,8 +92,7 @@ public class MemoryRole extends Abstract sb.append("\""); } sb.append("/>"); - return (sb.toString()); - + return sb.toString(); } Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java (original) +++ tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java Tue May 9 22:22:59 2017 @@ -91,11 +91,9 @@ public class MemoryUser extends Abstract */ @Override public Iterator<Group> getGroups() { - synchronized (groups) { - return (groups.iterator()); + return groups.iterator(); } - } @@ -104,11 +102,9 @@ public class MemoryUser extends Abstract */ @Override public Iterator<Role> getRoles() { - synchronized (roles) { - return (roles.iterator()); + return roles.iterator(); } - } @@ -117,9 +113,7 @@ public class MemoryUser extends Abstract */ @Override public UserDatabase getUserDatabase() { - - return (this.database); - + return this.database; } @@ -167,11 +161,9 @@ public class MemoryUser extends Abstract */ @Override public boolean isInGroup(Group group) { - synchronized (groups) { - return (groups.contains(group)); + return groups.contains(group); } - } @@ -184,11 +176,9 @@ public class MemoryUser extends Abstract */ @Override public boolean isInRole(Role role) { - synchronized (roles) { - return (roles.contains(role)); + return roles.contains(role); } - } Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java (original) +++ tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java Tue May 9 22:22:59 2017 @@ -143,11 +143,9 @@ public class MemoryUserDatabase implemen */ @Override public Iterator<Group> getGroups() { - synchronized (groups) { - return (groups.values().iterator()); + return groups.values().iterator(); } - } @@ -156,9 +154,7 @@ public class MemoryUserDatabase implemen */ @Override public String getId() { - - return (this.id); - + return this.id; } @@ -166,9 +162,7 @@ public class MemoryUserDatabase implemen * @return the relative or absolute pathname to the persistent storage file. */ public String getPathname() { - - return (this.pathname); - + return this.pathname; } @@ -190,9 +184,7 @@ public class MemoryUserDatabase implemen * @return the readonly status of the user database */ public boolean getReadonly() { - - return (this.readonly); - + return this.readonly; } @@ -213,11 +205,9 @@ public class MemoryUserDatabase implemen */ @Override public Iterator<Role> getRoles() { - synchronized (roles) { - return (roles.values().iterator()); + return roles.values().iterator(); } - } @@ -226,11 +216,9 @@ public class MemoryUserDatabase implemen */ @Override public Iterator<User> getUsers() { - synchronized (users) { - return (users.values().iterator()); + return users.values().iterator(); } - } @@ -266,7 +254,6 @@ public class MemoryUserDatabase implemen */ @Override public Group createGroup(String groupname, String description) { - if (groupname == null || groupname.length() == 0) { String msg = sm.getString("memoryUserDatabase.nullGroup"); log.warn(msg); @@ -277,8 +264,7 @@ public class MemoryUserDatabase implemen synchronized (groups) { groups.put(group.getGroupname(), group); } - return (group); - + return group; } @@ -290,7 +276,6 @@ public class MemoryUserDatabase implemen */ @Override public Role createRole(String rolename, String description) { - if (rolename == null || rolename.length() == 0) { String msg = sm.getString("memoryUserDatabase.nullRole"); log.warn(msg); @@ -301,8 +286,7 @@ public class MemoryUserDatabase implemen synchronized (roles) { roles.put(role.getRolename(), role); } - return (role); - + return role; } @@ -327,7 +311,7 @@ public class MemoryUserDatabase implemen synchronized (users) { users.put(user.getUsername(), user); } - return (user); + return user; } @@ -615,7 +599,6 @@ public class MemoryUserDatabase implemen */ @Override public String toString() { - StringBuilder sb = new StringBuilder("MemoryUserDatabase[id="); sb.append(this.id); sb.append(",pathname="); @@ -627,7 +610,7 @@ public class MemoryUserDatabase implemen sb.append(",userCount="); sb.append(this.users.size()); sb.append("]"); - return (sb.toString()); + return sb.toString(); } } @@ -671,7 +654,7 @@ class MemoryGroupCreationFactory extends } } } - return (group); + return group; } private final MemoryUserDatabase database; @@ -695,7 +678,7 @@ class MemoryRoleCreationFactory extends } String description = attributes.getValue("description"); Role role = database.createRole(rolename, description); - return (role); + return role; } private final MemoryUserDatabase database; @@ -765,7 +748,7 @@ class MemoryUserCreationFactory extends } } } - return (user); + return user; } private final MemoryUserDatabase database; Modified: tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java (original) +++ tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java Tue May 9 22:22:59 2017 @@ -76,11 +76,11 @@ public class MemoryUserDatabaseFactory i // We only know how to deal with <code>javax.naming.Reference</code>s // that specify a class name of "org.apache.catalina.UserDatabase" if ((obj == null) || !(obj instanceof Reference)) { - return (null); + return null; } Reference ref = (Reference) obj; if (!"org.apache.catalina.UserDatabase".equals(ref.getClassName())) { - return (null); + return null; } // Create and configure a MemoryUserDatabase instance based on the @@ -103,7 +103,7 @@ public class MemoryUserDatabaseFactory i // Don't try something we know won't work if (!database.getReadonly()) database.save(); - return (database); + return database; } Modified: tomcat/trunk/java/org/apache/catalina/util/CharsetMapper.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/CharsetMapper.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/CharsetMapper.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/CharsetMapper.java Tue May 9 22:22:59 2017 @@ -110,7 +110,7 @@ public class CharsetMapper { charset = map.getProperty(locale.getLanguage()); } } - return (charset); + return charset; } Modified: tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java Tue May 9 22:22:59 2017 @@ -178,8 +178,7 @@ public class DOMWriter { } } - return (array); - + return array; } /** @@ -225,6 +224,6 @@ public class DOMWriter { } } - return (str.toString()); + return str.toString(); } } Modified: tomcat/trunk/java/org/apache/catalina/util/Extension.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/Extension.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/Extension.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/Extension.java Tue May 9 22:22:59 2017 @@ -55,7 +55,7 @@ public final class Extension { public String getExtensionName() { - return (this.extensionName); + return this.extensionName; } public void setExtensionName(String extensionName) { @@ -69,7 +69,7 @@ public final class Extension { private String implementationURL = null; public String getImplementationURL() { - return (this.implementationURL); + return this.implementationURL; } public void setImplementationURL(String implementationURL) { @@ -84,7 +84,7 @@ public final class Extension { private String implementationVendor = null; public String getImplementationVendor() { - return (this.implementationVendor); + return this.implementationVendor; } public void setImplementationVendor(String implementationVendor) { @@ -99,7 +99,7 @@ public final class Extension { private String implementationVendorId = null; public String getImplementationVendorId() { - return (this.implementationVendorId); + return this.implementationVendorId; } public void setImplementationVendorId(String implementationVendorId) { @@ -114,7 +114,7 @@ public final class Extension { private String implementationVersion = null; public String getImplementationVersion() { - return (this.implementationVersion); + return this.implementationVersion; } public void setImplementationVersion(String implementationVersion) { @@ -129,7 +129,7 @@ public final class Extension { private String specificationVendor = null; public String getSpecificationVendor() { - return (this.specificationVendor); + return this.specificationVendor; } public void setSpecificationVendor(String specificationVendor) { @@ -144,7 +144,7 @@ public final class Extension { private String specificationVersion = null; public String getSpecificationVersion() { - return (this.specificationVersion); + return this.specificationVersion; } public void setSpecificationVersion(String specificationVersion) { @@ -216,7 +216,6 @@ public final class Extension { @Override public String toString() { - StringBuilder sb = new StringBuilder("Extension["); sb.append(extensionName); if (implementationURL != null) { @@ -244,8 +243,7 @@ public final class Extension { sb.append(specificationVersion); } sb.append("]"); - return (sb.toString()); - + return sb.toString(); } Modified: tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java Tue May 9 22:22:59 2017 @@ -117,7 +117,6 @@ public class ManifestResource { @Override public String toString() { - StringBuilder sb = new StringBuilder("ManifestResource["); sb.append(resourceName); @@ -133,7 +132,7 @@ public class ManifestResource { case APPLICATION : sb.append(", resourceType=APPLICATION"); break; } sb.append("]"); - return (sb.toString()); + return sb.toString(); } Modified: tomcat/trunk/java/org/apache/catalina/util/ResourceSet.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ResourceSet.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/ResourceSet.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/ResourceSet.java Tue May 9 22:22:59 2017 @@ -104,9 +104,7 @@ public final class ResourceSet<T> extend * @return the locked state of this parameter map. */ public boolean isLocked() { - - return (this.locked); - + return this.locked; } @@ -116,9 +114,7 @@ public final class ResourceSet<T> extend * @param locked The new locked state */ public void setLocked(boolean locked) { - this.locked = locked; - } @@ -142,12 +138,10 @@ public final class ResourceSet<T> extend */ @Override public boolean add(T o) { - if (locked) throw new IllegalStateException (sm.getString("resourceSet.locked")); - return (super.add(o)); - + return super.add(o); } @@ -177,12 +171,10 @@ public final class ResourceSet<T> extend */ @Override public boolean remove(Object o) { - if (locked) throw new IllegalStateException (sm.getString("resourceSet.locked")); - return (super.remove(o)); - + return super.remove(o); } Modified: tomcat/trunk/java/org/apache/catalina/util/ServerInfo.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/util/ServerInfo.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/util/ServerInfo.java (original) +++ tomcat/trunk/java/org/apache/catalina/util/ServerInfo.java Tue May 9 22:22:59 2017 @@ -88,27 +88,21 @@ public class ServerInfo { * @return the server identification for this version of Tomcat. */ public static String getServerInfo() { - - return (serverInfo); - + return serverInfo; } /** * @return the server built time for this version of Tomcat. */ public static String getServerBuilt() { - - return (serverBuilt); - + return serverBuilt; } /** * @return the server's version number. */ public static String getServerNumber() { - - return (serverNumber); - + return serverNumber; } public static void main(String args[]) { Modified: tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java Tue May 9 22:22:59 2017 @@ -497,7 +497,7 @@ public abstract class AbstractAccessLogV * @return the format pattern. */ public String getPattern() { - return (this.pattern); + return this.pattern; } @@ -701,7 +701,7 @@ public abstract class AbstractAccessLogV } else { for (Locale l: Locale.getAvailableLocales()) { if (name.equals(l.toString())) { - return(l); + return l; } } } Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Tue May 9 22:22:59 2017 @@ -163,7 +163,7 @@ public class AccessLogValve extends Abst * @return the directory in which we create log files. */ public String getDirectory() { - return (directory); + return directory; } @@ -203,7 +203,7 @@ public class AccessLogValve extends Abst * @return the log file prefix. */ public String getPrefix() { - return (prefix); + return prefix; } @@ -282,7 +282,7 @@ public class AccessLogValve extends Abst * @return the log file suffix. */ public String getSuffix() { - return (suffix); + return suffix; } Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java Tue May 9 22:22:59 2017 @@ -159,11 +159,11 @@ public class ResolverImpl extends Resolv } else { switch (type) { case 0: - return (resource.isDirectory()); + return resource.isDirectory(); case 1: - return (resource.isFile()); + return resource.isFile(); case 2: - return (resource.isFile() && resource.getContentLength() > 0); + return resource.isFile() && resource.getContentLength() > 0; default: return false; } Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Tue May 9 22:22:59 2017 @@ -57,6 +57,6 @@ public class AjpAprProtocol extends Abst @Override protected String getNamePrefix() { - return ("ajp-apr"); + return "ajp-apr"; } } Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java?rev=1794651&r1=1794650&r2=1794651&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java (original) +++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java Tue May 9 22:22:59 2017 @@ -44,6 +44,6 @@ public class AjpNio2Protocol extends Abs @Override protected String getNamePrefix() { - return ("ajp-nio2"); + return "ajp-nio2"; } } --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
