You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by eb...@apache.org on 2017/05/09 22:23:01 UTC
svn commit: r1794651 [3/3] - in /tomcat/trunk: java/org/apache/catalina/
java/org/apache/catalina/ant/ java/org/apache/catalina/ant/jmx/
java/org/apache/catalina/authenticator/ java/org/apache/catalina/connector/
java/org/apache/catalina/core/ java/org...
Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/ajp/AjpNioProtocol.java Tue May 9 22:22:59 2017
@@ -43,6 +43,6 @@ public class AjpNioProtocol extends Abst
@Override
protected String getNamePrefix() {
- return ("ajp-nio");
+ return "ajp-nio";
}
}
Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Tue May 9 22:22:59 2017
@@ -228,7 +228,7 @@ public class Http11Processor extends Abs
// Check for compatible MIME-TYPE
String[] compressibleMimeTypes = protocol.getCompressibleMimeTypes();
if (compressibleMimeTypes != null) {
- return (startsWithStringArray(compressibleMimeTypes, response.getContentType()));
+ return startsWithStringArray(compressibleMimeTypes, response.getContentType());
}
}
Modified: tomcat/trunk/java/org/apache/el/parser/ELParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParser.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParser.java (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.java Tue May 9 22:22:59 2017
@@ -7,7 +7,7 @@ public class ELParser/*@bgen(jjtree)*/im
protected JJTELParserState jjtree = new JJTELParserState();
public static Node parse(String ref) throws ELException {
try {
- return (new ELParser(new StringReader(ref))).CompositeExpression();
+ return new ELParser(new StringReader(ref)).CompositeExpression();
} catch (ParseException pe) {
throw new ELException(pe.getMessage());
}
Modified: tomcat/trunk/java/org/apache/el/parser/ELParser.jjt
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/el/parser/ELParser.jjt?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/el/parser/ELParser.jjt (original)
+++ tomcat/trunk/java/org/apache/el/parser/ELParser.jjt Tue May 9 22:22:59 2017
@@ -43,7 +43,7 @@ public class ELParser {
public static Node parse(String ref) throws ELException {
try {
- return (new ELParser(new StringReader(ref))).CompositeExpression();
+ return new ELParser(new StringReader(ref)).CompositeExpression();
} catch (ParseException pe) {
throw new ELException(pe.getMessage());
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/AttributeParser.java Tue May 9 22:22:59 2017
@@ -50,8 +50,8 @@ public class AttributeParser {
public static String getUnquoted(String input, char quote,
boolean isELIgnored, boolean isDeferredSyntaxAllowedAsLiteral,
boolean strict, boolean quoteAttributeEL) {
- return (new AttributeParser(input, quote, isELIgnored,
- isDeferredSyntaxAllowedAsLiteral, strict, quoteAttributeEL)).getUnquoted();
+ return new AttributeParser(input, quote, isELIgnored,
+ isDeferredSyntaxAllowedAsLiteral, strict, quoteAttributeEL).getUnquoted();
}
/* The quoted input string. */
Modified: tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java (original)
+++ tomcat/trunk/java/org/apache/jasper/runtime/JspRuntimeLibrary.java Tue May 9 22:22:59 2017
@@ -835,9 +835,9 @@ public class JspRuntimeLibrary {
String relativePath) {
if (relativePath.startsWith("/"))
- return (relativePath);
+ return relativePath;
if (!(request instanceof HttpServletRequest))
- return (relativePath);
+ return relativePath;
HttpServletRequest hrequest = (HttpServletRequest) request;
String uri = (String) request.getAttribute(
RequestDispatcher.INCLUDE_SERVLET_PATH);
Modified: tomcat/trunk/java/org/apache/jasper/security/SecurityUtil.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/security/SecurityUtil.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/security/SecurityUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/security/SecurityUtil.java Tue May 9 22:22:59 2017
@@ -51,7 +51,7 @@ public final class SecurityUtil{
public static String filter(String message) {
if (message == null)
- return (null);
+ return null;
char content[] = new char[message.length()];
message.getChars(0, message.length(), content, 0);
@@ -74,7 +74,7 @@ public final class SecurityUtil{
result.append(content[i]);
}
}
- return (result.toString());
+ return result.toString();
}
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JasperLoader.java Tue May 9 22:22:59 2017
@@ -56,8 +56,7 @@ public class JasperLoader extends URLCla
*/
@Override
public Class<?> loadClass(String name) throws ClassNotFoundException {
-
- return (loadClass(name, false));
+ return loadClass(name, false);
}
/**
@@ -96,7 +95,7 @@ public class JasperLoader extends URLCla
if (clazz != null) {
if (resolve)
resolveClass(clazz);
- return (clazz);
+ return clazz;
}
// (.5) Permission to access this class when using a SecurityManager
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspCServletContext.java Tue May 9 22:22:59 2017
@@ -358,14 +358,12 @@ public class JspCServletContext implemen
*/
@Override
public InputStream getResourceAsStream(String path) {
-
try {
- return (getResource(path).openStream());
+ return getResource(path).openStream();
} catch (Throwable t) {
ExceptionUtils.handleThrowable(t);
- return (null);
+ return null;
}
-
}
@@ -383,10 +381,10 @@ public class JspCServletContext implemen
path += "/";
String basePath = getRealPath(path);
if (basePath == null)
- return (thePaths);
+ return thePaths;
File theBaseDir = new File(basePath);
if (!theBaseDir.exists() || !theBaseDir.isDirectory())
- return (thePaths);
+ return thePaths;
String theFiles[] = theBaseDir.list();
if (theFiles == null) {
return thePaths;
@@ -398,7 +396,7 @@ public class JspCServletContext implemen
else if (testFile.isDirectory())
thePaths.add(path + theFiles[i] + "/");
}
- return (thePaths);
+ return thePaths;
}
@@ -431,7 +429,7 @@ public class JspCServletContext implemen
*/
@Override
public String getServletContextName() {
- return (getServerInfo());
+ return getServerInfo();
}
@@ -443,7 +441,7 @@ public class JspCServletContext implemen
@Override
@Deprecated
public Enumeration<String> getServletNames() {
- return (new Vector<String>().elements());
+ return new Vector<String>().elements();
}
@@ -455,7 +453,7 @@ public class JspCServletContext implemen
@Override
@Deprecated
public Enumeration<Servlet> getServlets() {
- return (new Vector<Servlet>().elements());
+ return new Vector<Servlet>().elements();
}
Modified: tomcat/trunk/java/org/apache/juli/logging/LogFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/juli/logging/LogFactory.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/juli/logging/LogFactory.java (original)
+++ tomcat/trunk/java/org/apache/juli/logging/LogFactory.java Tue May 9 22:22:59 2017
@@ -193,8 +193,7 @@ public class LogFactory {
*/
public static Log getLog(Class<?> clazz)
throws LogConfigurationException {
- return (getFactory().getInstance(clazz));
-
+ return getFactory().getInstance(clazz);
}
@@ -213,8 +212,7 @@ public class LogFactory {
*/
public static Log getLog(String name)
throws LogConfigurationException {
- return (getFactory().getInstance(name));
-
+ return getFactory().getInstance(name);
}
Modified: tomcat/trunk/java/org/apache/naming/ContextBindings.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/ContextBindings.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/ContextBindings.java (original)
+++ tomcat/trunk/java/org/apache/naming/ContextBindings.java Tue May 9 22:22:59 2017
@@ -200,7 +200,7 @@ public class ContextBindings {
* context, otherwise <code>false</code>
*/
public static boolean isThreadBound() {
- return (threadBindings.containsKey(Thread.currentThread()));
+ return threadBindings.containsKey(Thread.currentThread());
}
Modified: tomcat/trunk/java/org/apache/naming/NamingContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/NamingContext.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/NamingContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/NamingContext.java Tue May 9 22:22:59 2017
@@ -832,7 +832,7 @@ public class NamingContext implements Co
// Link relative to this context
return lookup(link.substring(1));
} else {
- return (new InitialContext(env)).lookup(link);
+ return new InitialContext(env).lookup(link);
}
} else if (entry.type == NamingEntry.REFERENCE) {
try {
Modified: tomcat/trunk/java/org/apache/naming/SelectorContext.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/SelectorContext.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/SelectorContext.java (original)
+++ tomcat/trunk/java/org/apache/naming/SelectorContext.java Tue May 9 22:22:59 2017
@@ -751,10 +751,10 @@ public class SelectorContext implements
throws NamingException {
if ((!initialContext) && (name.startsWith(prefix))) {
- return (name.substring(prefixLength));
+ return name.substring(prefixLength);
} else {
if (initialContext) {
- return (name);
+ return name;
} else {
throw new NamingException
(sm.getString("selectorContext.noJavaUrl"));
Modified: tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java (original)
+++ tomcat/trunk/java/org/apache/naming/factory/MailSessionFactory.java Tue May 9 22:22:59 2017
@@ -94,7 +94,7 @@ public class MailSessionFactory implemen
// Return null if we cannot create an object of the requested type
final Reference ref = (Reference) refObj;
if (!ref.getClassName().equals(factoryType))
- return (null);
+ return null;
// Create a new Session inside a doPrivileged block, so that JavaMail
// can read its default properties without throwing Security
@@ -147,7 +147,7 @@ public class MailSessionFactory implemen
// Create and return the new Session object
Session session = Session.getInstance(props, auth);
- return (session);
+ return session;
}
} );
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ApplicationParameter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ApplicationParameter.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ApplicationParameter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ApplicationParameter.java Tue May 9 22:22:59 2017
@@ -43,7 +43,7 @@ public class ApplicationParameter implem
private String description = null;
public String getDescription() {
- return (this.description);
+ return this.description;
}
public void setDescription(String description) {
@@ -57,7 +57,7 @@ public class ApplicationParameter implem
private String name = null;
public String getName() {
- return (this.name);
+ return this.name;
}
public void setName(String name) {
@@ -72,7 +72,7 @@ public class ApplicationParameter implem
private boolean override = true;
public boolean getOverride() {
- return (this.override);
+ return this.override;
}
public void setOverride(boolean override) {
@@ -86,7 +86,7 @@ public class ApplicationParameter implem
private String value = null;
public String getValue() {
- return (this.value);
+ return this.value;
}
public void setValue(String value) {
@@ -114,7 +114,7 @@ public class ApplicationParameter implem
sb.append(", override=");
sb.append(override);
sb.append("]");
- return (sb.toString());
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextEjb.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextEjb.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextEjb.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextEjb.java Tue May 9 22:22:59 2017
@@ -40,7 +40,7 @@ public class ContextEjb extends Resource
private String home = null;
public String getHome() {
- return (this.home);
+ return this.home;
}
public void setHome(String home) {
@@ -54,7 +54,7 @@ public class ContextEjb extends Resource
private String link = null;
public String getLink() {
- return (this.link);
+ return this.link;
}
public void setLink(String link) {
@@ -67,7 +67,7 @@ public class ContextEjb extends Resource
private String remote = null;
public String getRemote() {
- return (this.remote);
+ return this.remote;
}
public void setRemote(String remote) {
@@ -108,7 +108,7 @@ public class ContextEjb extends Resource
sb.append(link);
}
sb.append("]");
- return (sb.toString());
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextEnvironment.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextEnvironment.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextEnvironment.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextEnvironment.java Tue May 9 22:22:59 2017
@@ -38,7 +38,7 @@ public class ContextEnvironment extends
private boolean override = true;
public boolean getOverride() {
- return (this.override);
+ return this.override;
}
public void setOverride(boolean override) {
@@ -52,7 +52,7 @@ public class ContextEnvironment extends
private String value = null;
public String getValue() {
- return (this.value);
+ return this.value;
}
public void setValue(String value) {
@@ -87,7 +87,7 @@ public class ContextEnvironment extends
sb.append(", override=");
sb.append(override);
sb.append("]");
- return (sb.toString());
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextHandler.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextHandler.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextHandler.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextHandler.java Tue May 9 22:22:59 2017
@@ -41,7 +41,7 @@ public class ContextHandler extends Reso
private String handlerclass = null;
public String getHandlerclass() {
- return (this.handlerclass);
+ return this.handlerclass;
}
public void setHandlerclass(String handlerclass) {
@@ -147,7 +147,7 @@ public class ContextHandler extends Reso
sb.append(this.listProperties());
}
sb.append("]");
- return (sb.toString());
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextLocalEjb.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextLocalEjb.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextLocalEjb.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextLocalEjb.java Tue May 9 22:22:59 2017
@@ -38,7 +38,7 @@ public class ContextLocalEjb extends Res
private String home = null;
public String getHome() {
- return (this.home);
+ return this.home;
}
public void setHome(String home) {
@@ -52,7 +52,7 @@ public class ContextLocalEjb extends Res
private String link = null;
public String getLink() {
- return (this.link);
+ return this.link;
}
public void setLink(String link) {
@@ -66,7 +66,7 @@ public class ContextLocalEjb extends Res
private String local = null;
public String getLocal() {
- return (this.local);
+ return this.local;
}
public void setLocal(String local) {
@@ -107,7 +107,7 @@ public class ContextLocalEjb extends Res
sb.append(local);
}
sb.append("]");
- return (sb.toString());
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextResource.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextResource.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextResource.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextResource.java Tue May 9 22:22:59 2017
@@ -40,7 +40,7 @@ public class ContextResource extends Res
private String auth = null;
public String getAuth() {
- return (this.auth);
+ return this.auth;
}
public void setAuth(String auth) {
@@ -54,7 +54,7 @@ public class ContextResource extends Res
private String scope = "Shareable";
public String getScope() {
- return (this.scope);
+ return this.scope;
}
public void setScope(String scope) {
@@ -124,7 +124,7 @@ public class ContextResource extends Res
sb.append(scope);
}
sb.append("]");
- return (sb.toString());
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextResourceEnvRef.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextResourceEnvRef.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextResourceEnvRef.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextResourceEnvRef.java Tue May 9 22:22:59 2017
@@ -38,7 +38,7 @@ public class ContextResourceEnvRef exten
private boolean override = true;
public boolean getOverride() {
- return (this.override);
+ return this.override;
}
public void setOverride(boolean override) {
@@ -64,7 +64,7 @@ public class ContextResourceEnvRef exten
sb.append(", override=");
sb.append(override);
sb.append("]");
- return (sb.toString());
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextResourceLink.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextResourceLink.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextResourceLink.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextResourceLink.java Tue May 9 22:22:59 2017
@@ -42,7 +42,7 @@ public class ContextResourceLink extends
private String factory = null;
public String getGlobal() {
- return (this.global);
+ return this.global;
}
public void setGlobal(String global) {
@@ -77,7 +77,7 @@ public class ContextResourceLink extends
sb.append(getGlobal());
}
sb.append("]");
- return (sb.toString());
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextService.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextService.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextService.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextService.java Tue May 9 22:22:59 2017
@@ -41,7 +41,7 @@ public class ContextService extends Reso
private String displayname = null;
public String getDisplayname() {
- return (this.displayname);
+ return this.displayname;
}
public void setDisplayname(String displayname) {
@@ -54,7 +54,7 @@ public class ContextService extends Reso
private String largeIcon = null;
public String getLargeIcon() {
- return (this.largeIcon);
+ return this.largeIcon;
}
public void setLargeIcon(String largeIcon) {
@@ -67,7 +67,7 @@ public class ContextService extends Reso
private String smallIcon = null;
public String getSmallIcon() {
- return (this.smallIcon);
+ return this.smallIcon;
}
public void setSmallIcon(String smallIcon) {
@@ -95,7 +95,7 @@ public class ContextService extends Reso
private String wsdlfile = null;
public String getWsdlfile() {
- return (this.wsdlfile);
+ return this.wsdlfile;
}
public void setWsdlfile(String wsdlfile) {
@@ -109,7 +109,7 @@ public class ContextService extends Reso
private String jaxrpcmappingfile = null;
public String getJaxrpcmappingfile() {
- return (this.jaxrpcmappingfile);
+ return this.jaxrpcmappingfile;
}
public void setJaxrpcmappingfile(String jaxrpcmappingfile) {
@@ -130,7 +130,7 @@ public class ContextService extends Reso
private String[] serviceqname = new String[2];
public String[] getServiceqname() {
- return (this.serviceqname);
+ return this.serviceqname;
}
public String getServiceqname(int i) {
@@ -258,7 +258,7 @@ public class ContextService extends Reso
sb.append(handlers);
}
sb.append("]");
- return (sb.toString());
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextTransaction.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextTransaction.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextTransaction.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ContextTransaction.java Tue May 9 22:22:59 2017
@@ -83,10 +83,8 @@ public class ContextTransaction implemen
*/
@Override
public String toString() {
-
StringBuilder sb = new StringBuilder("Transaction[");
sb.append("]");
- return (sb.toString());
-
+ return sb.toString();
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ErrorPage.java Tue May 9 22:22:59 2017
@@ -60,9 +60,7 @@ public class ErrorPage implements Serial
* @return the error code.
*/
public int getErrorCode() {
-
- return (this.errorCode);
-
+ return this.errorCode;
}
@@ -72,9 +70,7 @@ public class ErrorPage implements Serial
* @param errorCode The new error code
*/
public void setErrorCode(int errorCode) {
-
this.errorCode = errorCode;
-
}
@@ -97,9 +93,7 @@ public class ErrorPage implements Serial
* @return the exception type.
*/
public String getExceptionType() {
-
- return (this.exceptionType);
-
+ return this.exceptionType;
}
@@ -109,9 +103,7 @@ public class ErrorPage implements Serial
* @param exceptionType The new exception type
*/
public void setExceptionType(String exceptionType) {
-
this.exceptionType = exceptionType;
-
}
@@ -119,9 +111,7 @@ public class ErrorPage implements Serial
* @return the location.
*/
public String getLocation() {
-
- return (this.location);
-
+ return this.location;
}
@@ -148,7 +138,6 @@ public class ErrorPage implements Serial
*/
@Override
public String toString() {
-
StringBuilder sb = new StringBuilder("ErrorPage[");
if (exceptionType == null) {
sb.append("errorCode=");
@@ -160,8 +149,7 @@ public class ErrorPage implements Serial
sb.append(", location=");
sb.append(location);
sb.append("]");
- return (sb.toString());
-
+ return sb.toString();
}
public String getName() {
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FilterDef.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FilterDef.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FilterDef.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FilterDef.java Tue May 9 22:22:59 2017
@@ -47,7 +47,7 @@ public class FilterDef implements Serial
private String description = null;
public String getDescription() {
- return (this.description);
+ return this.description;
}
public void setDescription(String description) {
@@ -61,7 +61,7 @@ public class FilterDef implements Serial
private String displayName = null;
public String getDisplayName() {
- return (this.displayName);
+ return this.displayName;
}
public void setDisplayName(String displayName) {
@@ -89,7 +89,7 @@ public class FilterDef implements Serial
private String filterClass = null;
public String getFilterClass() {
- return (this.filterClass);
+ return this.filterClass;
}
public void setFilterClass(String filterClass) {
@@ -104,7 +104,7 @@ public class FilterDef implements Serial
private String filterName = null;
public String getFilterName() {
- return (this.filterName);
+ return this.filterName;
}
public void setFilterName(String filterName) {
@@ -122,7 +122,7 @@ public class FilterDef implements Serial
private String largeIcon = null;
public String getLargeIcon() {
- return (this.largeIcon);
+ return this.largeIcon;
}
public void setLargeIcon(String largeIcon) {
@@ -137,9 +137,7 @@ public class FilterDef implements Serial
private final Map<String, String> parameters = new HashMap<>();
public Map<String, String> getParameterMap() {
-
- return (this.parameters);
-
+ return this.parameters;
}
@@ -149,7 +147,7 @@ public class FilterDef implements Serial
private String smallIcon = null;
public String getSmallIcon() {
- return (this.smallIcon);
+ return this.smallIcon;
}
public void setSmallIcon(String smallIcon) {
@@ -194,15 +192,13 @@ public class FilterDef implements Serial
*/
@Override
public String toString() {
-
StringBuilder sb = new StringBuilder("FilterDef[");
sb.append("filterName=");
sb.append(this.filterName);
sb.append(", filterClass=");
sb.append(this.filterClass);
sb.append("]");
- return (sb.toString());
-
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/FilterMap.java Tue May 9 22:22:59 2017
@@ -60,7 +60,7 @@ public class FilterMap extends XmlEncodi
private String filterName = null;
public String getFilterName() {
- return (this.filterName);
+ return this.filterName;
}
public void setFilterName(String filterName) {
@@ -77,7 +77,7 @@ public class FilterMap extends XmlEncodi
if (matchAllServletNames) {
return new String[] {};
} else {
- return (this.servletNames);
+ return this.servletNames;
}
}
@@ -122,7 +122,7 @@ public class FilterMap extends XmlEncodi
if (matchAllUrlPatterns) {
return new String[] {};
} else {
- return (this.urlPatterns);
+ return this.urlPatterns;
}
}
@@ -203,7 +203,6 @@ public class FilterMap extends XmlEncodi
*/
@Override
public String toString() {
-
StringBuilder sb = new StringBuilder("FilterMap[");
sb.append("filterName=");
sb.append(this.filterName);
@@ -216,8 +215,7 @@ public class FilterMap extends XmlEncodi
sb.append(urlPatterns[i]);
}
sb.append("]");
- return (sb.toString());
-
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LoginConfig.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LoginConfig.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LoginConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/LoginConfig.java Tue May 9 22:22:59 2017
@@ -76,7 +76,7 @@ public class LoginConfig implements Seri
private String authMethod = null;
public String getAuthMethod() {
- return (this.authMethod);
+ return this.authMethod;
}
public void setAuthMethod(String authMethod) {
@@ -90,7 +90,7 @@ public class LoginConfig implements Seri
private String errorPage = null;
public String getErrorPage() {
- return (this.errorPage);
+ return this.errorPage;
}
public void setErrorPage(String errorPage) {
@@ -107,7 +107,7 @@ public class LoginConfig implements Seri
private String loginPage = null;
public String getLoginPage() {
- return (this.loginPage);
+ return this.loginPage;
}
public void setLoginPage(String loginPage) {
@@ -125,7 +125,7 @@ public class LoginConfig implements Seri
private String realmName = null;
public String getRealmName() {
- return (this.realmName);
+ return this.realmName;
}
public void setRealmName(String realmName) {
@@ -141,7 +141,6 @@ public class LoginConfig implements Seri
*/
@Override
public String toString() {
-
StringBuilder sb = new StringBuilder("LoginConfig[");
sb.append("authMethod=");
sb.append(authMethod);
@@ -158,8 +157,7 @@ public class LoginConfig implements Seri
sb.append(errorPage);
}
sb.append("]");
- return (sb.toString());
-
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/MessageDestination.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/MessageDestination.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/MessageDestination.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/MessageDestination.java Tue May 9 22:22:59 2017
@@ -38,7 +38,7 @@ public class MessageDestination extends
private String displayName = null;
public String getDisplayName() {
- return (this.displayName);
+ return this.displayName;
}
public void setDisplayName(String displayName) {
@@ -52,7 +52,7 @@ public class MessageDestination extends
private String largeIcon = null;
public String getLargeIcon() {
- return (this.largeIcon);
+ return this.largeIcon;
}
public void setLargeIcon(String largeIcon) {
@@ -66,7 +66,7 @@ public class MessageDestination extends
private String smallIcon = null;
public String getSmallIcon() {
- return (this.smallIcon);
+ return this.smallIcon;
}
public void setSmallIcon(String smallIcon) {
@@ -82,7 +82,6 @@ public class MessageDestination extends
*/
@Override
public String toString() {
-
StringBuilder sb = new StringBuilder("MessageDestination[");
sb.append("name=");
sb.append(getName());
@@ -103,7 +102,7 @@ public class MessageDestination extends
sb.append(getDescription());
}
sb.append("]");
- return (sb.toString());
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/MessageDestinationRef.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/MessageDestinationRef.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/MessageDestinationRef.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/MessageDestinationRef.java Tue May 9 22:22:59 2017
@@ -38,7 +38,7 @@ public class MessageDestinationRef exten
private String link = null;
public String getLink() {
- return (this.link);
+ return this.link;
}
public void setLink(String link) {
@@ -52,7 +52,7 @@ public class MessageDestinationRef exten
private String usage = null;
public String getUsage() {
- return (this.usage);
+ return this.usage;
}
public void setUsage(String usage) {
@@ -67,7 +67,6 @@ public class MessageDestinationRef exten
*/
@Override
public String toString() {
-
StringBuilder sb = new StringBuilder("MessageDestination[");
sb.append("name=");
sb.append(getName());
@@ -88,7 +87,7 @@ public class MessageDestinationRef exten
sb.append(getDescription());
}
sb.append("]");
- return (sb.toString());
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ResourceBase.java Tue May 9 22:22:59 2017
@@ -42,7 +42,7 @@ public class ResourceBase implements Ser
private String description = null;
public String getDescription() {
- return (this.description);
+ return this.description;
}
public void setDescription(String description) {
@@ -58,7 +58,7 @@ public class ResourceBase implements Ser
@Override
public String getName() {
- return (this.name);
+ return this.name;
}
public void setName(String name) {
@@ -72,7 +72,7 @@ public class ResourceBase implements Ser
private String type = null;
public String getType() {
- return (this.type);
+ return this.type;
}
public void setType(String type) {
@@ -207,7 +207,7 @@ public class ResourceBase implements Ser
private NamingResources resources = null;
public NamingResources getNamingResources() {
- return (this.resources);
+ return this.resources;
}
public void setNamingResources(NamingResources resources) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityCollection.java Tue May 9 22:22:59 2017
@@ -112,9 +112,7 @@ public class SecurityCollection extends
* @return the description of this web resource collection.
*/
public String getDescription() {
-
- return (this.description);
-
+ return this.description;
}
@@ -124,9 +122,7 @@ public class SecurityCollection extends
* @param description The new description
*/
public void setDescription(String description) {
-
this.description = description;
-
}
@@ -134,9 +130,7 @@ public class SecurityCollection extends
* @return the name of this web resource collection.
*/
public String getName() {
-
- return (this.name);
-
+ return this.name;
}
@@ -146,9 +140,7 @@ public class SecurityCollection extends
* @param name The new name
*/
public void setName(String name) {
-
this.name = name;
-
}
@@ -260,9 +252,7 @@ public class SecurityCollection extends
* explicitly included.
*/
public String[] findMethods() {
-
- return (methods);
-
+ return methods;
}
@@ -272,9 +262,7 @@ public class SecurityCollection extends
* methods are excluded.
*/
public String[] findOmittedMethods() {
-
- return (omittedMethods);
-
+ return omittedMethods;
}
@@ -285,13 +273,11 @@ public class SecurityCollection extends
* @return <code>true</code> if the pattern is part of the collection
*/
public boolean findPattern(String pattern) {
-
for (int i = 0; i < patterns.length; i++) {
if (patterns[i].equals(pattern))
return true;
}
return false;
-
}
@@ -301,9 +287,7 @@ public class SecurityCollection extends
* returned.
*/
public String[] findPatterns() {
-
- return (patterns);
-
+ return patterns;
}
@@ -402,7 +386,6 @@ public class SecurityCollection extends
*/
@Override
public String toString() {
-
StringBuilder sb = new StringBuilder("SecurityCollection[");
sb.append(name);
if (description != null) {
@@ -410,8 +393,7 @@ public class SecurityCollection extends
sb.append(description);
}
sb.append("]");
- return (sb.toString());
-
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityConstraint.java Tue May 9 22:22:59 2017
@@ -321,9 +321,7 @@ public class SecurityConstraint extends
* @return the roles array
*/
public String[] findAuthRoles() {
-
- return (authRoles);
-
+ return authRoles;
}
@@ -335,15 +333,13 @@ public class SecurityConstraint extends
* @return the collection
*/
public SecurityCollection findCollection(String name) {
-
if (name == null)
- return (null);
+ return null;
for (int i = 0; i < collections.length; i++) {
if (name.equals(collections[i].getName()))
- return (collections[i]);
+ return collections[i];
}
- return (null);
-
+ return null;
}
@@ -354,9 +350,7 @@ public class SecurityConstraint extends
* @return the collections array
*/
public SecurityCollection[] findCollections() {
-
- return (collections);
-
+ return collections;
}
@@ -466,7 +460,6 @@ public class SecurityConstraint extends
*/
@Override
public String toString() {
-
StringBuilder sb = new StringBuilder("SecurityConstraint[");
for (int i = 0; i < collections.length; i++) {
if (i > 0)
@@ -474,8 +467,7 @@ public class SecurityConstraint extends
sb.append(collections[i].getName());
}
sb.append("]");
- return (sb.toString());
-
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityRoleRef.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityRoleRef.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityRoleRef.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/SecurityRoleRef.java Tue May 9 22:22:59 2017
@@ -41,7 +41,7 @@ public class SecurityRoleRef implements
private String name = null;
public String getName() {
- return (this.name);
+ return this.name;
}
public void setName(String name) {
@@ -55,7 +55,7 @@ public class SecurityRoleRef implements
private String link = null;
public String getLink() {
- return (this.link);
+ return this.link;
}
public void setLink(String link) {
@@ -72,7 +72,6 @@ public class SecurityRoleRef implements
*/
@Override
public String toString() {
-
StringBuilder sb = new StringBuilder("SecurityRoleRef[");
sb.append("name=");
sb.append(name);
@@ -81,8 +80,7 @@ public class SecurityRoleRef implements
sb.append(link);
}
sb.append("]");
- return (sb.toString());
-
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ServletDef.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ServletDef.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ServletDef.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/descriptor/web/ServletDef.java Tue May 9 22:22:59 2017
@@ -46,7 +46,7 @@ public class ServletDef implements Seria
private String description = null;
public String getDescription() {
- return (this.description);
+ return this.description;
}
public void setDescription(String description) {
@@ -60,7 +60,7 @@ public class ServletDef implements Seria
private String displayName = null;
public String getDisplayName() {
- return (this.displayName);
+ return this.displayName;
}
public void setDisplayName(String displayName) {
@@ -74,7 +74,7 @@ public class ServletDef implements Seria
private String smallIcon = null;
public String getSmallIcon() {
- return (this.smallIcon);
+ return this.smallIcon;
}
public void setSmallIcon(String smallIcon) {
@@ -87,7 +87,7 @@ public class ServletDef implements Seria
private String largeIcon = null;
public String getLargeIcon() {
- return (this.largeIcon);
+ return this.largeIcon;
}
public void setLargeIcon(String largeIcon) {
@@ -102,7 +102,7 @@ public class ServletDef implements Seria
private String servletName = null;
public String getServletName() {
- return (this.servletName);
+ return this.servletName;
}
public void setServletName(String servletName) {
@@ -120,7 +120,7 @@ public class ServletDef implements Seria
private String servletClass = null;
public String getServletClass() {
- return (this.servletClass);
+ return this.servletClass;
}
public void setServletClass(String servletClass) {
@@ -134,7 +134,7 @@ public class ServletDef implements Seria
private String jspFile = null;
public String getJspFile() {
- return (this.jspFile);
+ return this.jspFile;
}
public void setJspFile(String jspFile) {
@@ -149,9 +149,7 @@ public class ServletDef implements Seria
private final Map<String, String> parameters = new HashMap<>();
public Map<String, String> getParameterMap() {
-
- return (this.parameters);
-
+ return this.parameters;
}
/**
@@ -178,7 +176,7 @@ public class ServletDef implements Seria
private Integer loadOnStartup = null;
public Integer getLoadOnStartup() {
- return (this.loadOnStartup);
+ return this.loadOnStartup;
}
public void setLoadOnStartup(String loadOnStartup) {
@@ -192,7 +190,7 @@ public class ServletDef implements Seria
private String runAs = null;
public String getRunAs() {
- return (this.runAs);
+ return this.runAs;
}
public void setRunAs(String runAs) {
@@ -206,7 +204,7 @@ public class ServletDef implements Seria
private final Set<SecurityRoleRef> securityRoleRefs = new HashSet<>();
public Set<SecurityRoleRef> getSecurityRoleRefs() {
- return (this.securityRoleRefs);
+ return this.securityRoleRefs;
}
/**
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/AbstractObjectCreationFactory.java Tue May 9 22:22:59 2017
@@ -59,9 +59,7 @@ public abstract class AbstractObjectCrea
*/
@Override
public Digester getDigester() {
-
- return (this.digester);
-
+ return this.digester;
}
@@ -73,9 +71,7 @@ public abstract class AbstractObjectCrea
*/
@Override
public void setDigester(Digester digester) {
-
this.digester = digester;
-
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/CallMethodRule.java Tue May 9 22:22:59 2017
@@ -452,7 +452,6 @@ public class CallMethodRule extends Rule
*/
@Override
public String toString() {
-
StringBuilder sb = new StringBuilder("CallMethodRule[");
sb.append("methodName=");
sb.append(methodName);
@@ -469,8 +468,7 @@ public class CallMethodRule extends Rule
}
sb.append("}");
sb.append("]");
- return (sb.toString());
-
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/CallParamRule.java Tue May 9 22:22:59 2017
@@ -191,7 +191,6 @@ public class CallParamRule extends Rule
*/
@Override
public String toString() {
-
StringBuilder sb = new StringBuilder("CallParamRule[");
sb.append("paramIndex=");
sb.append(paramIndex);
@@ -200,8 +199,7 @@ public class CallParamRule extends Rule
sb.append(", from stack=");
sb.append(fromStack);
sb.append("]");
- return (sb.toString());
-
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/Digester.java Tue May 9 22:22:59 2017
@@ -318,17 +318,15 @@ public class Digester extends DefaultHan
* @return the namespace URI
*/
public String findNamespaceURI(String prefix) {
-
ArrayStack<String> stack = namespaces.get(prefix);
if (stack == null) {
- return (null);
+ return null;
}
try {
return stack.peek();
} catch (EmptyStackException e) {
- return (null);
+ return null;
}
-
}
@@ -344,18 +342,16 @@ public class Digester extends DefaultHan
* @return the classloader
*/
public ClassLoader getClassLoader() {
-
if (this.classLoader != null) {
- return (this.classLoader);
+ return this.classLoader;
}
if (this.useContextClassLoader) {
ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
if (classLoader != null) {
- return (classLoader);
+ return classLoader;
}
}
- return (this.getClass().getClassLoader());
-
+ return this.getClass().getClassLoader();
}
@@ -367,9 +363,7 @@ public class Digester extends DefaultHan
* to revert to the standard rules
*/
public void setClassLoader(ClassLoader classLoader) {
-
this.classLoader = classLoader;
-
}
@@ -377,9 +371,7 @@ public class Digester extends DefaultHan
* @return the current depth of the element stack.
*/
public int getCount() {
-
- return (stack.size());
-
+ return stack.size();
}
@@ -387,14 +379,12 @@ public class Digester extends DefaultHan
* @return the name of the XML element that is currently being processed.
*/
public String getCurrentElementName() {
-
String elementName = match;
int lastSlash = elementName.lastIndexOf('/');
if (lastSlash >= 0) {
elementName = elementName.substring(lastSlash + 1);
}
- return (elementName);
-
+ return elementName;
}
@@ -402,9 +392,7 @@ public class Digester extends DefaultHan
* @return the error handler for this Digester.
*/
public ErrorHandler getErrorHandler() {
-
- return (this.errorHandler);
-
+ return this.errorHandler;
}
@@ -414,9 +402,7 @@ public class Digester extends DefaultHan
* @param errorHandler The new error handler
*/
public void setErrorHandler(ErrorHandler errorHandler) {
-
this.errorHandler = errorHandler;
-
}
@@ -447,8 +433,7 @@ public class Digester extends DefaultHan
factory.setFeature("http://apache.org/xml/features/validation/schema", true);
}
}
- return (factory);
-
+ return factory;
}
@@ -539,9 +524,7 @@ public class Digester extends DefaultHan
* @return the "namespace aware" flag for parsers we create.
*/
public boolean getNamespaceAware() {
-
- return (this.namespaceAware);
-
+ return this.namespaceAware;
}
@@ -551,9 +534,7 @@ public class Digester extends DefaultHan
* @param namespaceAware The new "namespace aware" flag
*/
public void setNamespaceAware(boolean namespaceAware) {
-
this.namespaceAware = namespaceAware;
-
}
@@ -571,9 +552,7 @@ public class Digester extends DefaultHan
* parsing under, if any.
*/
public String getPublicId() {
-
- return (this.publicId);
-
+ return this.publicId;
}
@@ -582,9 +561,7 @@ public class Digester extends DefaultHan
* added <code>Rule</code> objects.
*/
public String getRuleNamespaceURI() {
-
- return (getRules().getNamespaceURI());
-
+ return getRules().getNamespaceURI();
}
@@ -597,9 +574,7 @@ public class Digester extends DefaultHan
* regardless of the current namespace URI
*/
public void setRuleNamespaceURI(String ruleNamespaceURI) {
-
getRules().setNamespaceURI(ruleNamespaceURI);
-
}
@@ -611,7 +586,7 @@ public class Digester extends DefaultHan
// Return the parser we already created (if any)
if (parser != null) {
- return (parser);
+ return parser;
}
// Create a new parser
@@ -619,11 +594,10 @@ public class Digester extends DefaultHan
parser = getFactory().newSAXParser();
} catch (Exception e) {
log.error("Digester.getParser: ", e);
- return (null);
+ return null;
}
- return (parser);
-
+ return parser;
}
@@ -644,8 +618,7 @@ public class Digester extends DefaultHan
public Object getProperty(String property)
throws SAXNotRecognizedException, SAXNotSupportedException {
- return (getParser().getProperty(property));
-
+ return getParser().getProperty(property);
}
@@ -656,13 +629,11 @@ public class Digester extends DefaultHan
* @return the rules
*/
public Rules getRules() {
-
if (this.rules == null) {
this.rules = new RulesBase();
this.rules.setDigester(this);
}
- return (this.rules);
-
+ return this.rules;
}
@@ -673,10 +644,8 @@ public class Digester extends DefaultHan
* @param rules New Rules implementation
*/
public void setRules(Rules rules) {
-
this.rules = rules;
this.rules.setDigester(this);
-
}
@@ -684,9 +653,7 @@ public class Digester extends DefaultHan
* @return the boolean as to whether the context classloader should be used.
*/
public boolean getUseContextClassLoader() {
-
return useContextClassLoader;
-
}
@@ -710,9 +677,7 @@ public class Digester extends DefaultHan
* @return the validating parser flag.
*/
public boolean getValidating() {
-
- return (this.validating);
-
+ return this.validating;
}
@@ -723,9 +688,7 @@ public class Digester extends DefaultHan
* @param validating The new validating parser flag.
*/
public void setValidating(boolean validating) {
-
this.validating = validating;
-
}
@@ -733,9 +696,7 @@ public class Digester extends DefaultHan
* @return the rules validation flag.
*/
public boolean getRulesValidation() {
-
- return (this.rulesValidation);
-
+ return this.rulesValidation;
}
@@ -746,9 +707,7 @@ public class Digester extends DefaultHan
* @param rulesValidation The new rules validation flag.
*/
public void setRulesValidation(boolean rulesValidation) {
-
this.rulesValidation = rulesValidation;
-
}
@@ -756,9 +715,7 @@ public class Digester extends DefaultHan
* @return the fake attributes list.
*/
public Map<Class<?>, List<String>> getFakeAttributes() {
-
- return (this.fakeAttributes);
-
+ return this.fakeAttributes;
}
@@ -769,7 +726,6 @@ public class Digester extends DefaultHan
* @return <code>true</code> if this is a fake attribute
*/
public boolean isFakeAttribute(Object object, String name) {
-
if (fakeAttributes == null) {
return false;
}
@@ -782,7 +738,6 @@ public class Digester extends DefaultHan
} else {
return result.contains(name);
}
-
}
@@ -1323,7 +1278,7 @@ public class Digester extends DefaultHan
if (log.isDebugEnabled()) {
log.debug(" Cannot resolve entity: '" + publicId + "'");
}
- return (null);
+ return null;
} else {
// try to resolve using system ID
@@ -1353,7 +1308,7 @@ public class Digester extends DefaultHan
}
try {
- return (new InputSource(entityURL));
+ return new InputSource(entityURL);
} catch (Exception e) {
throw createSAXException(e);
}
@@ -1444,13 +1399,11 @@ public class Digester extends DefaultHan
* @exception SAXException if a parsing exception occurs
*/
public Object parse(File file) throws IOException, SAXException {
-
configure();
InputSource input = new InputSource(new FileInputStream(file));
input.setSystemId("file://" + file.getAbsolutePath());
getXMLReader().parse(input);
- return (root);
-
+ return root;
}
@@ -1464,11 +1417,9 @@ public class Digester extends DefaultHan
* @exception SAXException if a parsing exception occurs
*/
public Object parse(InputSource input) throws IOException, SAXException {
-
configure();
getXMLReader().parse(input);
- return (root);
-
+ return root;
}
@@ -1482,12 +1433,10 @@ public class Digester extends DefaultHan
* @exception SAXException if a parsing exception occurs
*/
public Object parse(InputStream input) throws IOException, SAXException {
-
configure();
InputSource is = new InputSource(input);
getXMLReader().parse(is);
- return (root);
-
+ return root;
}
@@ -1724,14 +1673,12 @@ public class Digester extends DefaultHan
* @return the top object
*/
public Object peek() {
-
try {
- return (stack.peek());
+ return stack.peek();
} catch (EmptyStackException e) {
log.warn("Empty stack (returning null)");
- return (null);
+ return null;
}
-
}
@@ -1745,14 +1692,12 @@ public class Digester extends DefaultHan
* @return the specified object
*/
public Object peek(int n) {
-
try {
- return (stack.peek(n));
+ return stack.peek(n);
} catch (EmptyStackException e) {
log.warn("Empty stack (returning null)");
- return (null);
+ return null;
}
-
}
@@ -1762,14 +1707,12 @@ public class Digester extends DefaultHan
* @return the top object
*/
public Object pop() {
-
try {
- return (stack.pop());
+ return stack.pop();
} catch (EmptyStackException e) {
log.warn("Empty stack (returning null)");
- return (null);
+ return null;
}
-
}
@@ -1841,14 +1784,12 @@ public class Digester extends DefaultHan
* @return the top object on the parameters stack
*/
public Object peekParams() {
-
try {
- return (params.peek());
+ return params.peek();
} catch (EmptyStackException e) {
log.warn("Empty stack (returning null)");
- return (null);
+ return null;
}
-
}
@@ -1861,17 +1802,15 @@ public class Digester extends DefaultHan
* @return the top object on the parameters stack
*/
public Object popParams() {
-
try {
if (log.isTraceEnabled()) {
log.trace("Popping params");
}
- return (params.pop());
+ return params.pop();
} catch (EmptyStackException e) {
log.warn("Empty stack (returning null)");
- return (null);
+ return null;
}
-
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/FactoryCreateRule.java Tue May 9 22:22:59 2017
@@ -168,14 +168,12 @@ public class FactoryCreateRule extends R
*/
@Override
public String toString() {
-
StringBuilder sb = new StringBuilder("FactoryCreateRule[");
if (creationFactory != null) {
sb.append("creationFactory=");
sb.append(creationFactory);
}
sb.append("]");
- return (sb.toString());
-
+ return sb.toString();
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/ObjectCreateRule.java Tue May 9 22:22:59 2017
@@ -145,15 +145,13 @@ public class ObjectCreateRule extends Ru
*/
@Override
public String toString() {
-
StringBuilder sb = new StringBuilder("ObjectCreateRule[");
sb.append("className=");
sb.append(className);
sb.append(", attributeName=");
sb.append(attributeName);
sb.append("]");
- return (sb.toString());
-
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/RuleSetBase.java Tue May 9 22:22:59 2017
@@ -47,9 +47,7 @@ public abstract class RuleSetBase implem
*/
@Override
public String getNamespaceURI() {
-
- return (this.namespaceURI);
-
+ return this.namespaceURI;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/RulesBase.java Tue May 9 22:22:59 2017
@@ -86,9 +86,7 @@ public class RulesBase implements Rules
*/
@Override
public Digester getDigester() {
-
- return (this.digester);
-
+ return this.digester;
}
@@ -116,9 +114,7 @@ public class RulesBase implements Rules
*/
@Override
public String getNamespaceURI() {
-
- return (this.namespaceURI);
-
+ return this.namespaceURI;
}
@@ -222,8 +218,7 @@ public class RulesBase implements Rules
if (rulesList == null) {
rulesList = new ArrayList<>();
}
- return (rulesList);
-
+ return rulesList;
}
@@ -236,9 +231,7 @@ public class RulesBase implements Rules
*/
@Override
public List<Rule> rules() {
-
- return (this.rules);
-
+ return this.rules;
}
@@ -256,14 +249,13 @@ public class RulesBase implements Rules
* @return a rules list
*/
protected List<Rule> lookup(String namespaceURI, String pattern) {
-
// Optimize when no namespace URI is specified
List<Rule> list = this.cache.get(pattern);
if (list == null) {
- return (null);
+ return null;
}
if ((namespaceURI == null) || (namespaceURI.length() == 0)) {
- return (list);
+ return list;
}
// Select only Rules that match on the specified namespace URI
@@ -276,8 +268,7 @@ public class RulesBase implements Rules
results.add(item);
}
}
- return (results);
-
+ return results;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/digester/SetNextRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/SetNextRule.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/SetNextRule.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/SetNextRule.java Tue May 9 22:22:59 2017
@@ -153,15 +153,13 @@ public class SetNextRule extends Rule {
*/
@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/tomcat/util/digester/SetPropertiesRule.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/digester/SetPropertiesRule.java Tue May 9 22:22:59 2017
@@ -86,10 +86,8 @@ public class SetPropertiesRule extends R
*/
@Override
public String toString() {
-
StringBuilder sb = new StringBuilder("SetPropertiesRule[");
sb.append("]");
- return (sb.toString());
-
+ return sb.toString();
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/AttributeInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/AttributeInfo.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/AttributeInfo.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/AttributeInfo.java Tue May 9 22:22:59 2017
@@ -45,7 +45,7 @@ public class AttributeInfo extends Featu
* @return the display name of this attribute.
*/
public String getDisplayName() {
- return (this.displayName);
+ return this.displayName;
}
public void setDisplayName(String displayName) {
@@ -58,7 +58,7 @@ public class AttributeInfo extends Featu
public String getGetMethod() {
if(getMethod == null)
getMethod = getMethodName(getName(), true, isIs());
- return (this.getMethod);
+ return this.getMethod;
}
public void setGetMethod(String getMethod) {
@@ -71,7 +71,7 @@ public class AttributeInfo extends Featu
* with an "is" getter
*/
public boolean isIs() {
- return (this.is);
+ return this.is;
}
public void setIs(boolean is) {
@@ -84,7 +84,7 @@ public class AttributeInfo extends Featu
* @return <code>true</code> if readable
*/
public boolean isReadable() {
- return (this.readable);
+ return this.readable;
}
public void setReadable(boolean readable) {
@@ -98,7 +98,7 @@ public class AttributeInfo extends Featu
public String getSetMethod() {
if( setMethod == null )
setMethod = getMethodName(getName(), false, false);
- return (this.setMethod);
+ return this.setMethod;
}
public void setSetMethod(String setMethod) {
@@ -110,7 +110,7 @@ public class AttributeInfo extends Featu
* @return <code>true</code> if writable
*/
public boolean isWriteable() {
- return (this.writeable);
+ return this.writeable;
}
public void setWriteable(boolean writeable) {
@@ -147,7 +147,6 @@ public class AttributeInfo extends Featu
* @return the method name
*/
private String getMethodName(String name, boolean getter, boolean is) {
-
StringBuilder sb = new StringBuilder();
if (getter) {
if (is)
@@ -158,8 +157,7 @@ public class AttributeInfo extends Featu
sb.append("set");
sb.append(Character.toUpperCase(name.charAt(0)));
sb.append(name.substring(1));
- return (sb.toString());
-
+ return sb.toString();
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseAttributeFilter.java Tue May 9 22:22:59 2017
@@ -136,7 +136,7 @@ public class BaseAttributeFilter impleme
if (names.size() < 1)
return true;
else
- return (names.contains(acn.getAttributeName()));
+ return names.contains(acn.getAttributeName());
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseModelMBean.java Tue May 9 22:22:59 2017
@@ -208,7 +208,7 @@ public class BaseModelMBean implements D
// Return the results of this method invocation
// FIXME - should we validate the return type?
- return (result);
+ return result;
}
@@ -236,7 +236,7 @@ public class BaseModelMBean implements D
// is the indication of a getter problem
}
}
- return (response);
+ return response;
}
@@ -321,7 +321,7 @@ public class BaseModelMBean implements D
// Return the results of this method invocation
// FIXME - should we validate the return type?
- return (result);
+ return result;
}
@@ -484,7 +484,7 @@ public class BaseModelMBean implements D
}
}
- return (getAttributes(names));
+ return getAttributes(names);
}
@@ -835,7 +835,7 @@ public class BaseModelMBean implements D
// Copy remaining notifications as reported by the application
System.arraycopy(current, 0, response, 2, current.length);
- return (response);
+ return response;
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/BaseNotificationBroadcaster.java Tue May 9 22:22:59 2017
@@ -121,9 +121,7 @@ public class BaseNotificationBroadcaster
*/
@Override
public MBeanNotificationInfo[] getNotificationInfo() {
-
- return (new MBeanNotificationInfo[0]);
-
+ return new MBeanNotificationInfo[0];
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/FeatureInfo.java Tue May 9 22:22:59 2017
@@ -48,7 +48,7 @@ public class FeatureInfo implements Seri
* @return the human-readable description of this feature.
*/
public String getDescription() {
- return (this.description);
+ return this.description;
}
public void setDescription(String description) {
@@ -61,7 +61,7 @@ public class FeatureInfo implements Seri
* in the same collection.
*/
public String getName() {
- return (this.name);
+ return this.name;
}
public void setName(String name) {
@@ -72,7 +72,7 @@ public class FeatureInfo implements Seri
* @return the fully qualified Java class name of this element.
*/
public String getType() {
- return (this.type);
+ return this.type;
}
public void setType(String type) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/ManagedBean.java Tue May 9 22:22:59 2017
@@ -209,7 +209,7 @@ public class ManagedBean implements java
* by this descriptor.
*/
public String getType() {
- return (this.type);
+ return this.type;
}
public void setType(String type) {
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/NotificationInfo.java Tue May 9 22:22:59 2017
@@ -151,6 +151,6 @@ public class NotificationInfo extends Fe
readLock.unlock();
}
sb.append("]");
- return (sb.toString());
+ return sb.toString();
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/modeler/Registry.java Tue May 9 22:22:59 2017
@@ -170,7 +170,7 @@ public class Registry implements Registr
registry.guard != guard ) {
return null;
}
- return (registry);
+ return registry;
}
// -------------------- Generic methods --------------------
Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java?rev=1794651&r1=1794650&r2=1794651&view=diff
==============================================================================
--- tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java (original)
+++ tomcat/trunk/webapps/examples/WEB-INF/classes/filters/ExampleFilter.java Tue May 9 22:22:59 2017
@@ -96,7 +96,7 @@ public final class ExampleFilter extends
StringBuilder sb = new StringBuilder("TimingFilter(");
sb.append(getFilterConfig());
sb.append(")");
- return (sb.toString());
+ return sb.toString();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org