Author: ebourg
Date: Tue May 9 22:22:59 2017
New Revision: 1794651
URL: http://svn.apache.org/viewvc?rev=1794651&view=rev
Log:
Removed unnecessary parentheses in return statements
Modified:
tomcat/trunk/java/org/apache/catalina/SessionEvent.java
tomcat/trunk/java/org/apache/catalina/ant/ResourcesTask.java
tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java
tomcat/trunk/java/org/apache/catalina/connector/Request.java
tomcat/trunk/java/org/apache/catalina/connector/Response.java
tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java
tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
tomcat/trunk/java/org/apache/catalina/core/StandardService.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java
tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoaderBase.java
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/trunk/java/org/apache/catalina/manager/ManagerServlet.java
tomcat/trunk/java/org/apache/catalina/manager/StatusTransformer.java
tomcat/trunk/java/org/apache/catalina/manager/host/HostManagerServlet.java
tomcat/trunk/java/org/apache/catalina/mapper/Mapper.java
tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanFactory.java
tomcat/trunk/java/org/apache/catalina/mbeans/MBeanUtils.java
tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java
tomcat/trunk/java/org/apache/catalina/session/FileStore.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/StandardSession.java
tomcat/trunk/java/org/apache/catalina/ssi/SSIServletRequestUtil.java
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/java/org/apache/catalina/startup/ExpandWar.java
tomcat/trunk/java/org/apache/catalina/startup/HomesUserDatabase.java
tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/trunk/java/org/apache/catalina/startup/SetNextNamingRule.java
tomcat/trunk/java/org/apache/catalina/startup/UserConfig.java
tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreContextAppender.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryBase.java
tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/RxTaskPool.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/bio/BioSender.java
tomcat/trunk/java/org/apache/catalina/tribes/transport/nio/NioSender.java
tomcat/trunk/java/org/apache/catalina/users/AbstractGroup.java
tomcat/trunk/java/org/apache/catalina/users/AbstractRole.java
tomcat/trunk/java/org/apache/catalina/users/AbstractUser.java
tomcat/trunk/java/org/apache/catalina/users/MemoryGroup.java
tomcat/trunk/java/org/apache/catalina/users/MemoryRole.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUser.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabase.java
tomcat/trunk/java/org/apache/catalina/users/MemoryUserDatabaseFactory.java
tomcat/trunk/java/org/apache/catalina/util/CharsetMapper.java
tomcat/trunk/java/org/apache/catalina/util/DOMWriter.java
tomcat/trunk/java/org/apache/catalina/util/Extension.java
tomcat/trunk/java/org/apache/catalina/util/ManifestResource.java
tomcat/trunk/java/org/apache/catalina/util/ResourceSet.java
tomcat/trunk/java/org/apache/catalina/util/ServerInfo.java
tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java
tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNio2Protocol.java
tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/trunk/java/org/apache/el/parser/ELParser.java
tomcat/trunk/java/org/apache/el/parser/ELParser.jjt
tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java
tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
tomcat/trunk/java/org/apache/jasper/security/SecurityUtil.java
tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java
tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
tomcat/trunk/java/org/apache/juli/logging/LogFactory.java
tomcat/trunk/java/org/apache/naming/ContextBindings.java
tomcat/trunk/java/org/apache/naming/NamingContext.java
tomcat/trunk/java/org/apache/naming/SelectorContext.java
tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ApplicationParameter.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextEjb.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextEnvironment.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextHandler.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextLocalEjb.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextResource.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextResourceEnvRef.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextResourceLink.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextService.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextTransaction.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FilterDef.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LoginConfig.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/MessageDestination.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/MessageDestinationRef.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityRoleRef.java
tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ServletDef.java
tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java
tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java
tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetNextRule.java
tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/AttributeInfo.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
Modified: tomcat/trunk/java/org/apache/catalina/SessionEvent.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/SessionEvent.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/SessionEvent.java (original)
+++ tomcat/trunk/java/org/apache/catalina/SessionEvent.java Tue May 9 22:22:59
2017
@@ -71,9 +71,7 @@ public final class SessionEvent extends
* @return the event data of this event.
*/
public Object getData() {
-
- return (this.data);
-
+ return this.data;
}
@@ -81,9 +79,7 @@ public final class SessionEvent extends
* @return the Session on which this event occurred.
*/
public Session getSession() {
-
- return (this.session);
-
+ return this.session;
}
@@ -91,9 +87,7 @@ public final class SessionEvent extends
* @return the event type of this event.
*/
public String getType() {
-
- return (this.type);
-
+ return this.type;
}
Modified: tomcat/trunk/java/org/apache/catalina/ant/ResourcesTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/ResourcesTask.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/ResourcesTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/ResourcesTask.java Tue May 9
22:22:59 2017
@@ -45,7 +45,7 @@ public class ResourcesTask extends Abstr
protected String type = null;
public String getType() {
- return (this.type);
+ return this.type;
}
public void setType(String type) {
Modified: tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/ValidatorTask.java Tue May 9
22:22:59 2017
@@ -54,7 +54,7 @@ public class ValidatorTask extends BaseR
protected String path = null;
public String getPath() {
- return (this.path);
+ return this.path;
}
public void setPath(String path) {
Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorTask.java Tue May
9 22:22:59 2017
@@ -131,7 +131,7 @@ public class JMXAccessorTask extends Bas
* @return the name used at remote MbeanServer
*/
public String getName() {
- return (this.name);
+ return this.name;
}
public void setName(String objectName) {
@@ -200,7 +200,7 @@ public class JMXAccessorTask extends Bas
* @return The login password for the <code>Manager</code> application.
*/
public String getPassword() {
- return (this.password);
+ return this.password;
}
public void setPassword(String password) {
@@ -211,7 +211,7 @@ public class JMXAccessorTask extends Bas
* @return The login username for the <code>JMX</code> MBeanServer.
*/
public String getUsername() {
- return (this.username);
+ return this.username;
}
public void setUsername(String username) {
@@ -222,7 +222,7 @@ public class JMXAccessorTask extends Bas
* @return The URL of the <code>JMX JSR 160</code> MBeanServer to be used.
*/
public String getUrl() {
- return (this.url);
+ return this.url;
}
public void setUrl(String url) {
@@ -233,7 +233,7 @@ public class JMXAccessorTask extends Bas
* @return The Host of the <code>JMX JSR 160</code> MBeanServer to be used.
*/
public String getHost() {
- return (this.host);
+ return this.host;
}
public void setHost(String host) {
@@ -244,7 +244,7 @@ public class JMXAccessorTask extends Bas
* @return The Port of the <code>JMX JSR 160</code> MBeanServer to be used.
*/
public String getPort() {
- return (this.port);
+ return this.port;
}
public void setPort(String port) {
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/FormAuthenticator.java
Tue May 9 22:22:59 2017
@@ -687,19 +687,17 @@ public class FormAuthenticator
* @return the original request URL
*/
protected String savedRequestURL(Session session) {
-
SavedRequest saved =
(SavedRequest) session.getNote(Constants.FORM_REQUEST_NOTE);
if (saved == null) {
- return (null);
+ return null;
}
StringBuilder sb = new StringBuilder(saved.getRequestURI());
if (saved.getQueryString() != null) {
sb.append('?');
sb.append(saved.getQueryString());
}
- return (sb.toString());
-
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/SavedRequest.java Tue
May 9 22:22:59 2017
@@ -53,7 +53,7 @@ public final class SavedRequest {
}
public Iterator<Cookie> getCookies() {
- return (cookies.iterator());
+ return cookies.iterator();
}
@@ -75,15 +75,15 @@ public final class SavedRequest {
}
public Iterator<String> getHeaderNames() {
- return (headers.keySet().iterator());
+ return headers.keySet().iterator();
}
public Iterator<String> getHeaderValues(String name) {
ArrayList<String> values = headers.get(name);
if (values == null)
- return ((new ArrayList<String>()).iterator());
+ return new ArrayList<String>().iterator();
else
- return (values.iterator());
+ return values.iterator();
}
@@ -97,7 +97,7 @@ public final class SavedRequest {
}
public Iterator<Locale> getLocales() {
- return (locales.iterator());
+ return locales.iterator();
}
@@ -107,7 +107,7 @@ public final class SavedRequest {
private String method = null;
public String getMethod() {
- return (this.method);
+ return this.method;
}
public void setMethod(String method) {
@@ -121,7 +121,7 @@ public final class SavedRequest {
private String queryString = null;
public String getQueryString() {
- return (this.queryString);
+ return this.queryString;
}
public void setQueryString(String queryString) {
@@ -135,7 +135,7 @@ public final class SavedRequest {
private String requestURI = null;
public String getRequestURI() {
- return (this.requestURI);
+ return this.requestURI;
}
public void setRequestURI(String requestURI) {
@@ -150,7 +150,7 @@ public final class SavedRequest {
private String decodedRequestURI = null;
public String getDecodedRequestURI() {
- return (this.decodedRequestURI);
+ return this.decodedRequestURI;
}
public void setDecodedRequestURI(String decodedRequestURI) {
@@ -164,7 +164,7 @@ public final class SavedRequest {
private ByteChunk body = null;
public ByteChunk getBody() {
- return (this.body);
+ return this.body;
}
public void setBody(ByteChunk body) {
@@ -177,7 +177,7 @@ public final class SavedRequest {
private String contentType = null;
public String getContentType() {
- return (this.contentType);
+ return this.contentType;
}
public void setContentType(String contentType) {
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyoteAdapter.java Tue May
9 22:22:59 2017
@@ -728,7 +728,7 @@ public class CoyoteAdapter implements Ad
// No session ID means no possibility of remap
if (contexts != null && sessionID != null) {
// Find the context associated with the session
- for (int i = (contexts.length); i > 0; i--) {
+ for (int i = contexts.length; i > 0; i--) {
Context ctxt = contexts[i - 1];
if (ctxt.getManager().findSession(sessionID) != null) {
// We found a context. Is it the one that has
Modified: tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/CoyotePrincipal.java Tue
May 9 22:22:59 2017
@@ -49,7 +49,7 @@ public class CoyotePrincipal implements
@Override
public String getName() {
- return (this.name);
+ return this.name;
}
@@ -62,12 +62,10 @@ public class CoyotePrincipal implements
*/
@Override
public String toString() {
-
StringBuilder sb = new StringBuilder("CoyotePrincipal[");
sb.append(this.name);
sb.append("]");
- return (sb.toString());
-
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/Request.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Request.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Request.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Request.java Tue May 9
22:22:59 2017
@@ -170,7 +170,7 @@ public class Request implements HttpServ
* @return the Coyote request object
*/
public org.apache.coyote.Request getCoyoteRequest() {
- return (this.coyoteRequest);
+ return this.coyoteRequest;
}
@@ -1247,7 +1247,7 @@ public class Request implements HttpServ
}
try {
- return (servletContext.getRealPath(path));
+ return servletContext.getRealPath(path);
} catch (IllegalArgumentException e) {
return null;
}
@@ -1360,7 +1360,7 @@ public class Request implements HttpServ
if (path == null) {
return null;
} else if (path.startsWith("/")) {
- return (context.getServletContext().getRequestDispatcher(path));
+ return context.getServletContext().getRequestDispatcher(path);
}
// Convert a request-relative path to a context-relative one
@@ -2353,7 +2353,7 @@ public class Request implements HttpServ
*/
@Override
public String getServletPath() {
- return (mappingData.wrapperPath.toString());
+ return mappingData.wrapperPath.toString();
}
@@ -2429,7 +2429,7 @@ public class Request implements HttpServ
@Override
@Deprecated
public boolean isRequestedSessionIdFromUrl() {
- return (isRequestedSessionIdFromURL());
+ return isRequestedSessionIdFromURL();
}
@@ -2523,7 +2523,7 @@ public class Request implements HttpServ
}
// Check for a role defined directly as a <security-role>
- return (realm.hasRole(getWrapper(), userPrincipal, role));
+ return realm.hasRole(getWrapper(), userPrincipal, role);
}
@@ -2901,7 +2901,7 @@ public class Request implements HttpServ
// There cannot be a session if no context has been assigned yet
Context context = getContext();
if (context == null) {
- return (null);
+ return null;
}
// Return the current session if it exists and is valid
@@ -2909,13 +2909,13 @@ public class Request implements HttpServ
session = null;
}
if (session != null) {
- return (session);
+ return session;
}
// Return the requested session if it exists and is valid
Manager manager = context.getManager();
if (manager == null) {
- return (null); // Sessions are not supported
+ return null; // Sessions are not supported
}
if (requestedSessionId != null) {
try {
@@ -2928,13 +2928,13 @@ public class Request implements HttpServ
}
if (session != null) {
session.access();
- return (session);
+ return session;
}
}
// Create a new session if requested and the response is not committed
if (!create) {
- return (null);
+ return null;
}
if (response != null
&& context.getServletContext()
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Tue May 9
22:22:59 2017
@@ -139,7 +139,7 @@ public class Response implements HttpSer
* @return the Context within which this Request is being processed.
*/
public Context getContext() {
- return (request.getContext());
+ return request.getContext();
}
@@ -330,9 +330,9 @@ public class Response implements HttpSer
* @return <code>true</code> if the application has committed the response
*/
public boolean isAppCommitted() {
- return (this.appCommitted || isCommitted() || isSuspended()
+ return this.appCommitted || isCommitted() || isSuspended()
|| ((getContentLength() > 0)
- && (getContentWritten() >= getContentLength())));
+ && (getContentWritten() >= getContentLength()));
}
@@ -345,7 +345,7 @@ public class Response implements HttpSer
* @return the Request with which this Response is associated.
*/
public org.apache.catalina.connector.Request getRequest() {
- return (this.request);
+ return this.request;
}
/**
@@ -600,7 +600,7 @@ public class Response implements HttpSer
*/
@Override
public Locale getLocale() {
- return (getCoyoteResponse().getLocale());
+ return getCoyoteResponse().getLocale();
}
@@ -1161,13 +1161,11 @@ public class Response implements HttpSer
*/
@Override
public String encodeRedirectURL(String url) {
-
if (isEncodeable(toAbsolute(url))) {
- return (toEncoded(url,
request.getSessionInternal().getIdInternal()));
+ return toEncoded(url,
request.getSessionInternal().getIdInternal());
} else {
- return (url);
+ return url;
}
-
}
@@ -1184,7 +1182,7 @@ public class Response implements HttpSer
@Override
@Deprecated
public String encodeRedirectUrl(String url) {
- return (encodeRedirectURL(url));
+ return encodeRedirectURL(url);
}
@@ -1213,9 +1211,9 @@ public class Response implements HttpSer
} else if (url.equals(absolute) && !hasPath(url)) {
url += '/';
}
- return (toEncoded(url,
request.getSessionInternal().getIdInternal()));
+ return toEncoded(url,
request.getSessionInternal().getIdInternal());
} else {
- return (url);
+ return url;
}
}
@@ -1234,7 +1232,7 @@ public class Response implements HttpSer
@Override
@Deprecated
public String encodeUrl(String url) {
- return (encodeURL(url));
+ return encodeURL(url);
}
@@ -1630,7 +1628,7 @@ public class Response implements HttpSer
protected String toAbsolute(String location) {
if (location == null) {
- return (location);
+ return location;
}
boolean leadingSlash = location.startsWith("/");
@@ -1705,7 +1703,7 @@ public class Response implements HttpSer
} else {
- return (location);
+ return location;
}
@@ -1834,9 +1832,8 @@ public class Response implements HttpSer
* @return the encoded URL
*/
protected String toEncoded(String url, String sessionId) {
-
if ((url == null) || (sessionId == null)) {
- return (url);
+ return url;
}
String path = url;
@@ -1862,8 +1859,7 @@ public class Response implements HttpSer
}
sb.append(anchor);
sb.append(query);
- return (sb.toString());
-
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/connector/ResponseFacade.java Tue May
9 22:22:59 2017
@@ -209,7 +209,7 @@ public class ResponseFacade implements H
if (isFinished()) {
response.setSuspended(true);
}
- return (sos);
+ return sos;
}
@@ -226,7 +226,7 @@ public class ResponseFacade implements H
if (isFinished()) {
response.setSuspended(true);
}
- return (writer);
+ return writer;
}
@@ -333,7 +333,7 @@ public class ResponseFacade implements H
sm.getString("responseFacade.nullResponse"));
}
- return (response.isAppCommitted());
+ return response.isAppCommitted();
}
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=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContext.java Tue May
9 22:22:59 2017
@@ -213,7 +213,7 @@ public class ApplicationContext implemen
@Override
public Object getAttribute(String name) {
- return (attributes.get(name));
+ return attributes.get(name);
}
@@ -348,14 +348,14 @@ public class ApplicationContext implemen
public String getMimeType(String file) {
if (file == null)
- return (null);
+ return null;
int period = file.lastIndexOf('.');
if (period < 0)
- return (null);
+ return null;
String extension = file.substring(period + 1);
if (extension.length() < 1)
- return (null);
- return (context.findMimeMapping(extension));
+ return null;
+ return context.findMimeMapping(extension);
}
@@ -371,12 +371,12 @@ public class ApplicationContext implemen
// Validate the name argument
if (name == null)
- return (null);
+ return null;
// Create and return a corresponding request dispatcher
Wrapper wrapper = (Wrapper) context.findChild(name);
if (wrapper == null)
- return (null);
+ return null;
return new ApplicationDispatcher(wrapper, null, null, null, null,
null, name);
@@ -395,7 +395,7 @@ public class ApplicationContext implemen
// Validate the path argument
if (path == null)
- return (null);
+ return null;
if (!path.startsWith("/"))
throw new IllegalArgumentException
(sm.getString
@@ -412,7 +412,7 @@ public class ApplicationContext implemen
normalizedPath = RequestUtil.normalize(normalizedPath);
if (normalizedPath == null)
- return (null);
+ return null;
if (getContext().getDispatchersUseEncodedPaths()) {
// Decode
@@ -464,7 +464,7 @@ public class ApplicationContext implemen
uriCC.append(normalizedPath, 0, semicolon > 0 ? semicolon : pos);
service.getMapper().map(context, uriMB, mappingData);
if (mappingData.wrapper == null) {
- return (null);
+ return null;
}
/*
* Append any trailing path params (separated by ';') that were
@@ -477,13 +477,13 @@ public class ApplicationContext implemen
} catch (Exception e) {
// Should never happen
log(sm.getString("applicationContext.mapping.error"), e);
- return (null);
+ return null;
}
Wrapper wrapper = mappingData.wrapper;
String wrapperPath = mappingData.wrapperPath.toString();
String pathInfo = mappingData.pathInfo.toString();
- ServletMapping mapping = (new
ApplicationMapping(mappingData)).getServletMapping();
+ ServletMapping mapping = new
ApplicationMapping(mappingData).getServletMapping();
mappingData.recycle();
@@ -1358,9 +1358,7 @@ public class ApplicationContext implemen
* @return the facade associated with this ApplicationContext.
*/
protected ServletContext getFacade() {
-
- return (this.facade);
-
+ return this.facade;
}
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=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationContextFacade.java
Tue May 9 22:22:59 2017
@@ -145,7 +145,7 @@ public class ApplicationContextFacade im
(theContext instanceof ApplicationContext)){
theContext = ((ApplicationContext)theContext).getFacade();
}
- return (theContext);
+ return theContext;
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationDispatcher.java Tue
May 9 22:22:59 2017
@@ -922,7 +922,7 @@ final class ApplicationDispatcher implem
else
((ServletRequestWrapper) previous).setRequest(wrapper);
state.wrapRequest = wrapper;
- return (wrapper);
+ return wrapper;
}
@@ -967,7 +967,7 @@ final class ApplicationDispatcher implem
else
((ServletResponseWrapper) previous).setResponse(wrapper);
state.wrapResponse = wrapper;
- return (wrapper);
+ return wrapper;
}
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterConfig.java Tue
May 9 22:22:59 2017
@@ -152,7 +152,7 @@ public final class ApplicationFilterConf
*/
@Override
public String getFilterName() {
- return (filterDef.getFilterName());
+ return filterDef.getFilterName();
}
/**
@@ -174,7 +174,7 @@ public final class ApplicationFilterConf
Map<String,String> map = filterDef.getParameterMap();
if (map == null) {
- return (null);
+ return null;
}
return map.get(name);
@@ -214,15 +214,13 @@ public final class ApplicationFilterConf
*/
@Override
public String toString() {
-
StringBuilder sb = new StringBuilder("ApplicationFilterConfig[");
sb.append("name=");
sb.append(filterDef.getFilterName());
sb.append(", filterClass=");
sb.append(filterDef.getFilterClass());
sb.append("]");
- return (sb.toString());
-
+ return sb.toString();
}
// --------------------------------------------------------- Public Methods
@@ -257,7 +255,7 @@ public final class ApplicationFilterConf
// Return the existing filter instance, if any
if (this.filter != null)
- return (this.filter);
+ return this.filter;
// Identify the class loader we will be using
String filterClass = filterDef.getFilterClass();
@@ -265,7 +263,7 @@ public final class ApplicationFilterConf
initFilter();
- return (this.filter);
+ return this.filter;
}
@@ -293,9 +291,7 @@ public final class ApplicationFilterConf
* Return the filter definition we are configured for.
*/
FilterDef getFilterDef() {
-
- return (this.filterDef);
-
+ return this.filterDef;
}
/**
Modified:
tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationFilterFactory.java
Tue May 9 22:22:59 2017
@@ -85,7 +85,7 @@ public final class ApplicationFilterFact
// If there are no filter mappings, we are done
if ((filterMaps == null) || (filterMaps.length == 0))
- return (filterChain);
+ return filterChain;
// Acquire the information we will need to match filter mappings
DispatcherType dispatcher =
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationHttpRequest.java Tue
May 9 22:22:59 2017
@@ -261,7 +261,7 @@ class ApplicationHttpRequest extends Htt
*/
@Override
public Enumeration<String> getAttributeNames() {
- return (new AttributeNamesEnumerator());
+ return new AttributeNamesEnumerator();
}
@@ -315,13 +315,13 @@ class ApplicationHttpRequest extends Htt
public RequestDispatcher getRequestDispatcher(String path) {
if (context == null)
- return (null);
+ return null;
// If the path is already context-relative, just pass it through
if (path == null)
- return (null);
+ return null;
else if (path.startsWith("/"))
- return (context.getServletContext().getRequestDispatcher(path));
+ return context.getServletContext().getRequestDispatcher(path);
// Convert a request-relative path to a context-relative one
String servletPath =
@@ -347,7 +347,7 @@ class ApplicationHttpRequest extends Htt
relative = requestPath + path;
}
- return (context.getServletContext().getRequestDispatcher(relative));
+ return context.getServletContext().getRequestDispatcher(relative);
}
@@ -371,9 +371,7 @@ class ApplicationHttpRequest extends Htt
*/
@Override
public String getContextPath() {
-
- return (this.contextPath);
-
+ return this.contextPath;
}
@@ -384,7 +382,6 @@ class ApplicationHttpRequest extends Htt
*/
@Override
public String getParameter(String name) {
-
parseParameters();
String[] value = parameters.get(name);
@@ -392,7 +389,6 @@ class ApplicationHttpRequest extends Htt
return null;
}
return value[0];
-
}
@@ -402,10 +398,8 @@ class ApplicationHttpRequest extends Htt
*/
@Override
public Map<String, String[]> getParameterMap() {
-
parseParameters();
- return (parameters);
-
+ return parameters;
}
@@ -415,7 +409,6 @@ class ApplicationHttpRequest extends Htt
*/
@Override
public Enumeration<String> getParameterNames() {
-
parseParameters();
return Collections.enumeration(parameters.keySet());
}
@@ -429,10 +422,8 @@ class ApplicationHttpRequest extends Htt
*/
@Override
public String[] getParameterValues(String name) {
-
parseParameters();
return parameters.get(name);
-
}
@@ -441,9 +432,7 @@ class ApplicationHttpRequest extends Htt
*/
@Override
public String getPathInfo() {
-
- return (this.pathInfo);
-
+ return this.pathInfo;
}
@@ -467,9 +456,7 @@ class ApplicationHttpRequest extends Htt
*/
@Override
public String getQueryString() {
-
- return (this.queryString);
-
+ return this.queryString;
}
@@ -479,9 +466,7 @@ class ApplicationHttpRequest extends Htt
*/
@Override
public String getRequestURI() {
-
- return (this.requestURI);
-
+ return this.requestURI;
}
@@ -501,9 +486,7 @@ class ApplicationHttpRequest extends Htt
*/
@Override
public String getServletPath() {
-
- return (this.servletPath);
-
+ return this.servletPath;
}
@@ -519,7 +502,7 @@ class ApplicationHttpRequest extends Htt
*/
@Override
public HttpSession getSession() {
- return (getSession(true));
+ return getSession(true);
}
@@ -536,11 +519,11 @@ class ApplicationHttpRequest extends Htt
// There cannot be a session if no context has been assigned yet
if (context == null)
- return (null);
+ return null;
// Return the current session if it exists and is valid
if (session != null && session.isValid()) {
- return (session.getSession());
+ return session.getSession();
}
HttpSession other = super.getSession(false);
@@ -784,10 +767,10 @@ class ApplicationHttpRequest extends Htt
protected int getSpecial(String name) {
for (int i = 0; i < specials.length; i++) {
if (specials[i].equals(name)) {
- return (i);
+ return i;
}
}
- return (-1);
+ return -1;
}
@@ -948,7 +931,7 @@ class ApplicationHttpRequest extends Htt
for (int i = pos + 1; i <= last; i++) {
if (getAttribute(specials[i]) != null) {
pos = i;
- return (specials[i]);
+ return specials[i];
}
}
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java Tue
May 9 22:22:59 2017
@@ -82,7 +82,7 @@ public class ApplicationPushBuilder impl
current = ((ServletRequestWrapper) current).getRequest();
}
if (current instanceof Request) {
- catalinaRequest = ((Request) current);
+ catalinaRequest = (Request) current;
coyoteRequest = catalinaRequest.getCoyoteRequest();
} else {
throw new UnsupportedOperationException(sm.getString(
Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationRequest.java Tue May
9 22:22:59 2017
@@ -104,7 +104,7 @@ class ApplicationRequest extends Servlet
public Object getAttribute(String name) {
synchronized (attributes) {
- return (attributes.get(name));
+ return attributes.get(name);
}
}
Modified: tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/ContainerBase.java Tue May 9
22:22:59 2017
@@ -354,12 +354,10 @@ public abstract class ContainerBase exte
*/
@Override
public Log getLogger() {
-
if (logger != null)
- return (logger);
+ return logger;
logger = LogFactory.getLog(getLogName());
- return (logger);
-
+ return logger;
}
@@ -484,9 +482,7 @@ public abstract class ContainerBase exte
*/
@Override
public String getName() {
-
- return (name);
-
+ return name;
}
@@ -517,9 +513,7 @@ public abstract class ContainerBase exte
* @return <code>true</code> if the children will be started
*/
public boolean getStartChildren() {
-
- return (startChildren);
-
+ return startChildren;
}
@@ -543,9 +537,7 @@ public abstract class ContainerBase exte
*/
@Override
public Container getParent() {
-
- return (parent);
-
+ return parent;
}
@@ -578,12 +570,11 @@ public abstract class ContainerBase exte
@Override
public ClassLoader getParentClassLoader() {
if (parentClassLoader != null)
- return (parentClassLoader);
+ return parentClassLoader;
if (parent != null) {
- return (parent.getParentClassLoader());
+ return parent.getParentClassLoader();
}
- return (ClassLoader.getSystemClassLoader());
-
+ return ClassLoader.getSystemClassLoader();
}
@@ -612,9 +603,7 @@ public abstract class ContainerBase exte
*/
@Override
public Pipeline getPipeline() {
-
- return (this.pipeline);
-
+ return this.pipeline;
}
@@ -630,9 +619,9 @@ public abstract class ContainerBase exte
l.lock();
try {
if (realm != null)
- return (realm);
+ return realm;
if (parent != null)
- return (parent.getRealm());
+ return parent.getRealm();
return null;
} finally {
l.unlock();
Modified: tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/NamingContextListener.java Tue
May 9 22:22:59 2017
@@ -179,7 +179,7 @@ public class NamingContextListener
* @return the "name" property.
*/
public String getName() {
- return (this.name);
+ return this.name;
}
@@ -761,7 +761,7 @@ public class NamingContextListener
",name=" + quotedResourceName);
}
- return (name);
+ return name;
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardContext.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardContext.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardContext.java Tue May 9
22:22:59 2017
@@ -1208,9 +1208,7 @@ public class StandardContext extends Con
* @return <code>true</code> if classloading delegates to the parent
classloader first
*/
public boolean getDelegate() {
-
- return (this.delegate);
-
+ return this.delegate;
}
@@ -1234,9 +1232,7 @@ public class StandardContext extends Con
* @return true if the internal naming support is used.
*/
public boolean isUseNaming() {
-
- return (useNaming);
-
+ return useNaming;
}
@@ -1285,7 +1281,7 @@ public class StandardContext extends Con
@Override
public Object[] getApplicationLifecycleListeners() {
- return (applicationLifecycleListenersObjects);
+ return applicationLifecycleListenersObjects;
}
@@ -1321,9 +1317,7 @@ public class StandardContext extends Con
* @return the antiResourceLocking flag for this Context.
*/
public boolean getAntiResourceLocking() {
-
- return (this.antiResourceLocking);
-
+ return this.antiResourceLocking;
}
@@ -1359,7 +1353,7 @@ public class StandardContext extends Con
}
}
- return (this.charsetMapper);
+ return this.charsetMapper;
}
@@ -1664,9 +1658,7 @@ public class StandardContext extends Con
*/
@Override
public String getDisplayName() {
-
- return (this.displayName);
-
+ return this.displayName;
}
@@ -1713,9 +1705,7 @@ public class StandardContext extends Con
*/
@Override
public boolean getDistributable() {
-
- return (this.distributable);
-
+ return this.distributable;
}
/**
@@ -1739,9 +1729,7 @@ public class StandardContext extends Con
*/
@Override
public String getDocBase() {
-
- return (this.docBase);
-
+ return this.docBase;
}
@@ -1753,9 +1741,7 @@ public class StandardContext extends Con
*/
@Override
public void setDocBase(String docBase) {
-
this.docBase = docBase;
-
}
public String getJ2EEApplication() {
@@ -1913,9 +1899,7 @@ public class StandardContext extends Con
*/
@Override
public LoginConfig getLoginConfig() {
-
- return (this.loginConfig);
-
+ return this.loginConfig;
}
@@ -1972,12 +1956,10 @@ public class StandardContext extends Con
*/
@Override
public NamingResourcesImpl getNamingResources() {
-
if (namingResources == null) {
setNamingResources(new NamingResourcesImpl());
}
- return (namingResources);
-
+ return namingResources;
}
@@ -2038,7 +2020,7 @@ public class StandardContext extends Con
*/
@Override
public String getPath() {
- return (path);
+ return path;
}
@@ -2080,9 +2062,7 @@ public class StandardContext extends Con
*/
@Override
public String getPublicId() {
-
- return (this.publicId);
-
+ return this.publicId;
}
@@ -2111,9 +2091,7 @@ public class StandardContext extends Con
*/
@Override
public boolean getReloadable() {
-
- return (this.reloadable);
-
+ return this.reloadable;
}
@@ -2122,9 +2100,7 @@ public class StandardContext extends Con
*/
@Override
public boolean getOverride() {
-
- return (this.override);
-
+ return this.override;
}
@@ -2134,9 +2110,7 @@ public class StandardContext extends Con
* Is only set as deployment has change docRoot!
*/
public String getOriginalDocBase() {
-
- return (this.originalDocBase);
-
+ return this.originalDocBase;
}
/**
@@ -2159,13 +2133,13 @@ public class StandardContext extends Con
@Override
public ClassLoader getParentClassLoader() {
if (parentClassLoader != null)
- return (parentClassLoader);
+ return parentClassLoader;
if (getPrivileged()) {
return this.getClass().getClassLoader();
} else if (parent != null) {
- return (parent.getParentClassLoader());
+ return parent.getParentClassLoader();
}
- return (ClassLoader.getSystemClassLoader());
+ return ClassLoader.getSystemClassLoader();
}
@@ -2174,9 +2148,7 @@ public class StandardContext extends Con
*/
@Override
public boolean getPrivileged() {
-
- return (this.privileged);
-
+ return this.privileged;
}
@@ -2252,14 +2224,12 @@ public class StandardContext extends Con
*/
@Override
public ServletContext getServletContext() {
-
if (context == null) {
context = new ApplicationContext(this);
if (altDDName != null)
context.setAttribute(Globals.ALT_DD_ATTR,altDDName);
}
- return (context.getFacade());
-
+ return context.getFacade();
}
@@ -2269,9 +2239,7 @@ public class StandardContext extends Con
*/
@Override
public int getSessionTimeout() {
-
- return (this.sessionTimeout);
-
+ return this.sessionTimeout;
}
@@ -2303,9 +2271,7 @@ public class StandardContext extends Con
*/
@Override
public boolean getSwallowOutput() {
-
- return (this.swallowOutput);
-
+ return this.swallowOutput;
}
@@ -2332,9 +2298,7 @@ public class StandardContext extends Con
* @return the value of the unloadDelay flag.
*/
public long getUnloadDelay() {
-
- return (this.unloadDelay);
-
+ return this.unloadDelay;
}
@@ -2361,9 +2325,7 @@ public class StandardContext extends Con
* @return unpack WAR flag.
*/
public boolean getUnpackWAR() {
-
- return (unpackWAR);
-
+ return unpackWAR;
}
@@ -2373,9 +2335,7 @@ public class StandardContext extends Con
* @param unpackWAR <code>true</code> to unpack WARs on deployment
*/
public void setUnpackWAR(boolean unpackWAR) {
-
this.unpackWAR = unpackWAR;
-
}
@@ -2408,9 +2368,7 @@ public class StandardContext extends Con
*/
@Override
public String getWrapperClass() {
-
- return (this.wrapperClassName);
-
+ return this.wrapperClassName;
}
@@ -2533,9 +2491,7 @@ public class StandardContext extends Con
* @return the Locale to character set mapper class for this Context.
*/
public String getCharsetMapperClass() {
-
- return (this.charsetMapperClass);
-
+ return this.charsetMapperClass;
}
@@ -2581,9 +2537,7 @@ public class StandardContext extends Con
* @return the work directory for this Context.
*/
public String getWorkDir() {
-
- return (this.workDir);
-
+ return this.workDir;
}
@@ -2619,9 +2573,7 @@ public class StandardContext extends Con
* @return the clearReferencesStopThreads flag for this Context.
*/
public boolean getClearReferencesStopThreads() {
-
- return (this.clearReferencesStopThreads);
-
+ return this.clearReferencesStopThreads;
}
@@ -2646,7 +2598,7 @@ public class StandardContext extends Con
* @return the clearReferencesStopTimerThreads flag for this Context.
*/
public boolean getClearReferencesStopTimerThreads() {
- return (this.clearReferencesStopTimerThreads);
+ return this.clearReferencesStopTimerThreads;
}
@@ -2672,7 +2624,7 @@ public class StandardContext extends Con
* Context.
*/
public boolean getClearReferencesHttpClientKeepAliveThread() {
- return (this.clearReferencesHttpClientKeepAliveThread);
+ return this.clearReferencesHttpClientKeepAliveThread;
}
@@ -3326,7 +3278,7 @@ public class StandardContext extends Con
public ApplicationParameter[] findApplicationParameters() {
synchronized (applicationParametersLock) {
- return (applicationParameters);
+ return applicationParameters;
}
}
@@ -3338,9 +3290,7 @@ public class StandardContext extends Con
*/
@Override
public SecurityConstraint[] findConstraints() {
-
- return (constraints);
-
+ return constraints;
}
@@ -3364,11 +3314,9 @@ public class StandardContext extends Con
*/
@Override
public ErrorPage findErrorPage(String exceptionType) {
-
synchronized (exceptionPages) {
- return (exceptionPages.get(exceptionType));
+ return exceptionPages.get(exceptionType);
}
-
}
@@ -3391,7 +3339,7 @@ public class StandardContext extends Con
results[i] = results1[i];
for (int i = results1.length; i < results.length; i++)
results[i] = results2[i - results1.length];
- return (results);
+ return results;
}
}
@@ -3406,11 +3354,9 @@ public class StandardContext extends Con
*/
@Override
public FilterDef findFilterDef(String filterName) {
-
synchronized (filterDefs) {
- return (filterDefs.get(filterName));
+ return filterDefs.get(filterName);
}
-
}
@@ -3419,12 +3365,10 @@ public class StandardContext extends Con
*/
@Override
public FilterDef[] findFilterDefs() {
-
synchronized (filterDefs) {
FilterDef results[] = new FilterDef[filterDefs.size()];
- return (filterDefs.values().toArray(results));
+ return filterDefs.values().toArray(results);
}
-
}
@@ -3444,11 +3388,9 @@ public class StandardContext extends Con
* @param name Name of the desired message destination
*/
public MessageDestination findMessageDestination(String name) {
-
synchronized (messageDestinations) {
- return (messageDestinations.get(name));
+ return messageDestinations.get(name);
}
-
}
@@ -3458,13 +3400,11 @@ public class StandardContext extends Con
* is returned.
*/
public MessageDestination[] findMessageDestinations() {
-
synchronized (messageDestinations) {
MessageDestination results[] =
new MessageDestination[messageDestinations.size()];
- return (messageDestinations.values().toArray(results));
+ return messageDestinations.values().toArray(results);
}
-
}
@@ -3475,9 +3415,7 @@ public class StandardContext extends Con
* @param name Name of the desired message destination ref
*/
public MessageDestinationRef findMessageDestinationRef(String name) {
-
return namingResources.findMessageDestinationRef(name);
-
}
@@ -3487,9 +3425,7 @@ public class StandardContext extends Con
* is returned.
*/
public MessageDestinationRef[] findMessageDestinationRefs() {
-
return namingResources.findMessageDestinationRefs();
-
}
@@ -3501,9 +3437,7 @@ public class StandardContext extends Con
*/
@Override
public String findMimeMapping(String extension) {
-
- return (mimeMappings.get(extension.toLowerCase(Locale.ENGLISH)));
-
+ return mimeMappings.get(extension.toLowerCase(Locale.ENGLISH));
}
@@ -3513,13 +3447,10 @@ public class StandardContext extends Con
*/
@Override
public String[] findMimeMappings() {
-
synchronized (mimeMappings) {
String results[] = new String[mimeMappings.size()];
- return
- (mimeMappings.keySet().toArray(results));
+ return mimeMappings.keySet().toArray(results);
}
-
}
@@ -3558,16 +3489,14 @@ public class StandardContext extends Con
*/
@Override
public String findRoleMapping(String role) {
-
String realRole = null;
synchronized (roleMappings) {
realRole = roleMappings.get(role);
}
if (realRole != null)
- return (realRole);
+ return realRole;
else
- return (role);
-
+ return role;
}
@@ -3597,11 +3526,9 @@ public class StandardContext extends Con
*/
@Override
public String[] findSecurityRoles() {
-
synchronized (securityRolesLock) {
- return (securityRoles);
+ return securityRoles;
}
-
}
@@ -3613,11 +3540,9 @@ public class StandardContext extends Con
*/
@Override
public String findServletMapping(String pattern) {
-
synchronized (servletMappingsLock) {
- return (servletMappings.get(pattern));
+ return servletMappings.get(pattern);
}
-
}
@@ -3662,16 +3587,14 @@ public class StandardContext extends Con
*/
@Override
public int[] findStatusPages() {
-
synchronized (statusPages) {
int results[] = new int[statusPages.size()];
Iterator<Integer> elements = statusPages.keySet().iterator();
int i = 0;
while (elements.hasNext())
results[i++] = elements.next().intValue();
- return (results);
+ return results;
}
-
}
@@ -3713,11 +3636,9 @@ public class StandardContext extends Con
*/
@Override
public String[] findWelcomeFiles() {
-
synchronized (welcomeFilesLock) {
- return (welcomeFiles);
+ return welcomeFiles;
}
-
}
@@ -3727,11 +3648,9 @@ public class StandardContext extends Con
*/
@Override
public String[] findWrapperLifecycles() {
-
synchronized (wrapperLifecyclesLock) {
- return (wrapperLifecycles);
+ return wrapperLifecycles;
}
-
}
@@ -3741,11 +3660,9 @@ public class StandardContext extends Con
*/
@Override
public String[] findWrapperListeners() {
-
synchronized (wrapperListenersLock) {
- return (wrapperListeners);
+ return wrapperListeners;
}
-
}
@@ -4627,9 +4544,7 @@ public class StandardContext extends Con
* @return the filter config object
*/
public FilterConfig findFilterConfig(String name) {
-
- return (filterConfigs.get(name));
-
+ return filterConfigs.get(name);
}
@@ -4744,7 +4659,7 @@ public class StandardContext extends Con
ok = false;
}
}
- return (ok);
+ return ok;
}
@@ -5638,15 +5553,15 @@ public class StandardContext extends Con
protected String adjustURLPattern(String urlPattern) {
if (urlPattern == null)
- return (urlPattern);
+ return urlPattern;
if (urlPattern.startsWith("/") || urlPattern.startsWith("*."))
- return (urlPattern);
+ return urlPattern;
if (!isServlet22())
- return (urlPattern);
+ return urlPattern;
if(log.isDebugEnabled())
log.debug(sm.getString("standardContext.urlPattern.patternWarning",
urlPattern));
- return ("/" + urlPattern);
+ return "/" + urlPattern;
}
@@ -5902,9 +5817,7 @@ public class StandardContext extends Con
*/
@Override
public boolean getPaused() {
-
- return (this.paused);
-
+ return this.paused;
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Tue May 9
22:22:59 2017
@@ -131,9 +131,7 @@ public class StandardEngine extends Cont
*/
@Override
public String getDefaultHost() {
-
- return (defaultHost);
-
+ return defaultHost;
}
@@ -184,9 +182,7 @@ public class StandardEngine extends Cont
*/
@Override
public Service getService() {
-
- return (this.service);
-
+ return this.service;
}
@@ -337,11 +333,11 @@ public class StandardEngine extends Cont
@Override
public ClassLoader getParentClassLoader() {
if (parentClassLoader != null)
- return (parentClassLoader);
+ return parentClassLoader;
if (service != null) {
- return (service.getParentClassLoader());
+ return service.getParentClassLoader();
}
- return (ClassLoader.getSystemClassLoader());
+ return ClassLoader.getSystemClassLoader();
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHost.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHost.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHost.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHost.java Tue May 9
22:22:59 2017
@@ -212,7 +212,7 @@ public class StandardHost extends Contai
*/
@Override
public String getAppBase() {
- return (this.appBase);
+ return this.appBase;
}
@@ -272,9 +272,7 @@ public class StandardHost extends Contai
*/
@Override
public String getXmlBase() {
-
- return (this.xmlBase);
-
+ return this.xmlBase;
}
@@ -288,11 +286,9 @@ public class StandardHost extends Contai
*/
@Override
public void setXmlBase(String xmlBase) {
-
String oldXmlBase = this.xmlBase;
this.xmlBase = xmlBase;
support.firePropertyChange("xmlBase", oldXmlBase, this.xmlBase);
-
}
@@ -354,9 +350,7 @@ public class StandardHost extends Contai
*/
@Override
public boolean getAutoDeploy() {
-
- return (this.autoDeploy);
-
+ return this.autoDeploy;
}
@@ -382,9 +376,7 @@ public class StandardHost extends Contai
*/
@Override
public String getConfigClass() {
-
- return (this.configClass);
-
+ return this.configClass;
}
@@ -410,9 +402,7 @@ public class StandardHost extends Contai
* for new web applications.
*/
public String getContextClass() {
-
- return (this.contextClass);
-
+ return this.contextClass;
}
@@ -439,9 +429,7 @@ public class StandardHost extends Contai
*/
@Override
public boolean getDeployOnStartup() {
-
- return (this.deployOnStartup);
-
+ return this.deployOnStartup;
}
@@ -465,9 +453,7 @@ public class StandardHost extends Contai
* @return <code>true</code> if XML context descriptors should be deployed.
*/
public boolean isDeployXML() {
-
return deployXML;
-
}
@@ -477,9 +463,7 @@ public class StandardHost extends Contai
* @param deployXML <code>true</code> if context descriptors should be
deployed
*/
public void setDeployXML(boolean deployXML) {
-
this.deployXML = deployXML;
-
}
@@ -487,9 +471,7 @@ public class StandardHost extends Contai
* @return the copy XML config file flag for this component.
*/
public boolean isCopyXML() {
-
return this.copyXML;
-
}
@@ -499,9 +481,7 @@ public class StandardHost extends Contai
* @param copyXML The new copy XML flag
*/
public void setCopyXML(boolean copyXML) {
-
this.copyXML = copyXML;
-
}
@@ -510,9 +490,7 @@ public class StandardHost extends Contai
* for new web applications.
*/
public String getErrorReportValveClass() {
-
- return (this.errorReportValveClass);
-
+ return this.errorReportValveClass;
}
@@ -539,9 +517,7 @@ public class StandardHost extends Contai
*/
@Override
public String getName() {
-
- return (name);
-
+ return name;
}
@@ -573,9 +549,7 @@ public class StandardHost extends Contai
* @return <code>true</code> if WARs should be unpacked on deployment.
*/
public boolean isUnpackWARs() {
-
- return (unpackWARs);
-
+ return unpackWARs;
}
@@ -585,9 +559,7 @@ public class StandardHost extends Contai
* @param unpackWARs <code>true</code> to unpack WARs on deployment
*/
public void setUnpackWARs(boolean unpackWARs) {
-
this.unpackWARs = unpackWARs;
-
}
@@ -595,8 +567,7 @@ public class StandardHost extends Contai
* @return host work directory base.
*/
public String getWorkDir() {
-
- return (workDir);
+ return workDir;
}
@@ -606,7 +577,6 @@ public class StandardHost extends Contai
* @param workDir the new base work folder for this host
*/
public void setWorkDir(String workDir) {
-
this.workDir = workDir;
}
@@ -787,11 +757,9 @@ public class StandardHost extends Contai
*/
@Override
public String[] findAliases() {
-
synchronized (aliasesLock) {
- return (this.aliases);
+ return this.aliases;
}
-
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardHostValve.java Tue May
9 22:22:59 2017
@@ -424,14 +424,14 @@ final class StandardHostValve extends Va
(Context context, Throwable exception) {
if (exception == null) {
- return (null);
+ return null;
}
Class<?> clazz = exception.getClass();
String name = clazz.getName();
while (!Object.class.equals(clazz)) {
ErrorPage errorPage = context.findErrorPage(name);
if (errorPage != null) {
- return (errorPage);
+ return errorPage;
}
clazz = clazz.getSuperclass();
if (clazz == null) {
@@ -439,7 +439,7 @@ final class StandardHostValve extends Va
}
name = clazz.getName();
}
- return (null);
+ return null;
}
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java Tue May 9
22:22:59 2017
@@ -137,9 +137,7 @@ public class StandardPipeline extends Li
*/
@Override
public Container getContainer() {
-
- return (this.container);
-
+ return this.container;
}
@@ -150,9 +148,7 @@ public class StandardPipeline extends Li
*/
@Override
public void setContainer(Container container) {
-
this.container = container;
-
}
@@ -239,9 +235,7 @@ public class StandardPipeline extends Li
*/
@Override
public Valve getBasic() {
-
- return (this.basic);
-
+ return this.basic;
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardServer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardServer.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardServer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardServer.java Tue May 9
22:22:59 2017
@@ -187,9 +187,7 @@ public final class StandardServer extend
*/
@Override
public javax.naming.Context getGlobalNamingContext() {
-
- return (this.globalNamingContext);
-
+ return this.globalNamingContext;
}
@@ -198,11 +196,8 @@ public final class StandardServer extend
*
* @param globalNamingContext The new global naming resource context
*/
- public void setGlobalNamingContext
- (javax.naming.Context globalNamingContext) {
-
+ public void setGlobalNamingContext(javax.naming.Context
globalNamingContext) {
this.globalNamingContext = globalNamingContext;
-
}
@@ -211,9 +206,7 @@ public final class StandardServer extend
*/
@Override
public NamingResourcesImpl getGlobalNamingResources() {
-
- return (this.globalNamingResources);
-
+ return this.globalNamingResources;
}
@@ -269,9 +262,7 @@ public final class StandardServer extend
*/
@Override
public int getPort() {
-
- return (this.port);
-
+ return this.port;
}
@@ -282,9 +273,7 @@ public final class StandardServer extend
*/
@Override
public void setPort(int port) {
-
this.port = port;
-
}
@@ -293,9 +282,7 @@ public final class StandardServer extend
*/
@Override
public String getAddress() {
-
- return (this.address);
-
+ return this.address;
}
@@ -306,9 +293,7 @@ public final class StandardServer extend
*/
@Override
public void setAddress(String address) {
-
this.address = address;
-
}
/**
@@ -316,9 +301,7 @@ public final class StandardServer extend
*/
@Override
public String getShutdown() {
-
- return (this.shutdown);
-
+ return this.shutdown;
}
@@ -329,9 +312,7 @@ public final class StandardServer extend
*/
@Override
public void setShutdown(String shutdown) {
-
this.shutdown = shutdown;
-
}
@@ -552,19 +533,17 @@ public final class StandardServer extend
*/
@Override
public Service findService(String name) {
-
if (name == null) {
- return (null);
+ return null;
}
synchronized (servicesLock) {
for (int i = 0; i < services.length; i++) {
if (name.equals(services[i].getName())) {
- return (services[i]);
+ return services[i];
}
}
}
- return (null);
-
+ return null;
}
@@ -689,12 +668,10 @@ public final class StandardServer extend
*/
@Override
public String toString() {
-
StringBuilder sb = new StringBuilder("StandardServer[");
sb.append(getPort());
sb.append("]");
- return (sb.toString());
-
+ return sb.toString();
}
@@ -898,11 +875,11 @@ public final class StandardServer extend
@Override
public ClassLoader getParentClassLoader() {
if (parentClassLoader != null)
- return (parentClassLoader);
+ return parentClassLoader;
if (catalina != null) {
- return (catalina.getParentClassLoader());
+ return catalina.getParentClassLoader();
}
- return (ClassLoader.getSystemClassLoader());
+ return ClassLoader.getSystemClassLoader();
}
/**
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardService.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardService.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardService.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardService.java Tue May 9
22:22:59 2017
@@ -327,7 +327,7 @@ public class StandardService extends Lif
StringBuilder sb = new StringBuilder("StandardService[");
sb.append(getName());
sb.append("]");
- return (sb.toString());
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapper.java Tue May 9
22:22:59 2017
@@ -298,9 +298,7 @@ public class StandardWrapper extends Con
*/
@Override
public long getAvailable() {
-
- return (this.available);
-
+ return this.available;
}
@@ -315,7 +313,6 @@ public class StandardWrapper extends Con
*/
@Override
public void setAvailable(long available) {
-
long oldAvailable = this.available;
if (available > System.currentTimeMillis())
this.available = available;
@@ -323,7 +320,6 @@ public class StandardWrapper extends Con
this.available = 0L;
support.firePropertyChange("available", Long.valueOf(oldAvailable),
Long.valueOf(this.available));
-
}
@@ -352,7 +348,7 @@ public class StandardWrapper extends Con
*/
return Integer.MAX_VALUE;
} else {
- return (this.loadOnStartup);
+ return this.loadOnStartup;
}
}
@@ -406,9 +402,7 @@ public class StandardWrapper extends Con
* thread model servlet is used.
*/
public int getMaxInstances() {
-
- return (this.maxInstances);
-
+ return this.maxInstances;
}
@@ -454,9 +448,7 @@ public class StandardWrapper extends Con
*/
@Override
public String getRunAs() {
-
- return (this.runAs);
-
+ return this.runAs;
}
@@ -480,9 +472,7 @@ public class StandardWrapper extends Con
*/
@Override
public String getServletClass() {
-
- return (this.servletClass);
-
+ return this.servletClass;
}
@@ -1435,9 +1425,7 @@ public class StandardWrapper extends Con
*/
@Override
public String getInitParameter(String name) {
-
- return (findInitParameter(name));
-
+ return findInitParameter(name);
}
@@ -1463,14 +1451,12 @@ public class StandardWrapper extends Con
*/
@Override
public ServletContext getServletContext() {
-
if (parent == null)
- return (null);
+ return null;
else if (!(parent instanceof Context))
- return (null);
+ return null;
else
- return (((Context) parent).getServletContext());
-
+ return ((Context) parent).getServletContext();
}
@@ -1479,9 +1465,7 @@ public class StandardWrapper extends Con
*/
@Override
public String getServletName() {
-
- return (getName());
-
+ return getName();
}
public long getProcessingTime() {
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardWrapperFacade.java Tue
May 9 22:22:59 2017
@@ -81,7 +81,7 @@ public final class StandardWrapperFacade
context = ((ApplicationContext) context).getFacade();
}
}
- return (context);
+ return context;
}
Modified:
tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/filters/CsrfPreventionFilter.java Tue
May 9 22:22:59 2017
@@ -178,7 +178,7 @@ public class CsrfPreventionFilter extend
private String addNonce(String url) {
if ((url == null) || (nonce == null)) {
- return (url);
+ return url;
}
String path = url;
@@ -205,7 +205,7 @@ public class CsrfPreventionFilter extend
sb.append('=');
sb.append(nonce);
sb.append(anchor);
- return (sb.toString());
+ return sb.toString();
}
}
Modified: tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/backend/CollectedInfo.java Tue May
9 22:22:59 2017
@@ -83,7 +83,7 @@ public class CollectedInfo {
break; /* Done port and host are the expected ones */
}
if (objName == null)
- throw(new Exception("Can't find connector for " + host + ":" +
port));
+ throw new Exception("Can't find connector for " + host + ":" +
port);
this.port = iport;
this.host = shost;
@@ -91,7 +91,7 @@ public class CollectedInfo {
public void refresh() throws Exception {
if (mBeanServer == null || objName == null) {
- throw(new Exception("Not initialized!!!"));
+ throw new Exception("Not initialized!!!");
}
Integer imax = (Integer) mBeanServer.getAttribute(objName,
"maxThreads");
Modified: tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/deploy/FarmWarDeployer.java Tue
May 9 22:22:59 2017
@@ -700,9 +700,7 @@ public class FarmWarDeployer extends Clu
* @return the frequency of watcher checks.
*/
public int getProcessDeployFrequency() {
-
- return (this.processDeployFrequency);
-
+ return this.processDeployFrequency;
}
/**
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/ha/session/ClusterSessionListener.java
Tue May 9 22:22:59 2017
@@ -105,7 +105,7 @@ public class ClusterSessionListener exte
*/
@Override
public boolean accept(ClusterMessage msg) {
- return (msg instanceof SessionMessage);
+ return msg instanceof SessionMessage;
}
}
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Tue May
9 22:22:59 2017
@@ -426,7 +426,7 @@ public class DeltaManager extends Cluste
if (log.isDebugEnabled())
log.debug(sm.getString("deltaManager.createSession.newSession",
session.getId(), Integer.valueOf(sessions.size())));
- return (session);
+ return session;
}
/**
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaSession.java Tue May
9 22:22:59 2017
@@ -401,7 +401,8 @@ public class DeltaSession extends Standa
}
}
}
- return (this.isValid);
+
+ return this.isValid;
}
/**
@@ -498,7 +499,7 @@ public class DeltaSession extends Standa
sb.append("DeltaSession[");
sb.append(id);
sb.append("]");
- return (sb.toString());
+ return sb.toString();
}
@Override
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Tue May
9 22:22:59 2017
@@ -224,7 +224,7 @@ public class SimpleTcpCluster extends Li
*/
@Override
public Container getContainer() {
- return (this.container);
+ return this.container;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
