Modified: tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java?rev=1724626&r1=1724625&r2=1724626&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/AbstractAccessLogValve.java Thu Jan 14 14:55:44 2016 @@ -475,7 +475,7 @@ public abstract class AbstractAccessLogV } /** - * @return Returns the enabled. + * @return the enabled flag. */ public boolean getEnabled() { return enabled; @@ -490,7 +490,7 @@ public abstract class AbstractAccessLogV } /** - * Return the format pattern. + * @return the format pattern. */ public String getPattern() { return (this.pattern); @@ -519,6 +519,7 @@ public abstract class AbstractAccessLogV * Return whether the attribute name to look for when * performing conditional logging. If null, every * request is logged. + * @return the attribute name */ public String getCondition() { return condition; @@ -540,6 +541,7 @@ public abstract class AbstractAccessLogV * Return whether the attribute name to look for when * performing conditional logging. If null, every * request is logged. + * @return the attribute name */ public String getConditionUnless() { return getCondition(); @@ -560,6 +562,7 @@ public abstract class AbstractAccessLogV * Return whether the attribute name to look for when * performing conditional logging. If null, every * request is logged. + * @return the attribute name */ public String getConditionIf() { return conditionIf; @@ -579,6 +582,7 @@ public abstract class AbstractAccessLogV /** * Return the locale used to format timestamps in log entries and in * log file name suffix. + * @return the locale */ public String getLocale() { return localeName; @@ -671,8 +675,8 @@ public abstract class AbstractAccessLogV * second since a new Date was created, this method simply gives out the * same Date again so that the system doesn't spend time creating Date * objects unnecessarily. - * - * @return Date + * @param systime The time + * @return the date object */ private static Date getDate(long systime) { Date date = localDate.get(); @@ -682,7 +686,10 @@ public abstract class AbstractAccessLogV /** - * Find a locale by name + * Find a locale by name. + * @param name The locale name + * @param fallback Fallback locale if the name is not found + * @return the locale object */ protected static Locale findLocale(String name, Locale fallback) { if (name == null || name.isEmpty()) { @@ -1155,7 +1162,7 @@ public abstract class AbstractAccessLogV private final boolean conversion; /** - * if conversion is true, write '-' instead of 0 - %b + * @param conversion <code>true</code> to write '-' instead of 0 - %b. */ public ByteSentElement(boolean conversion) { this.conversion = conversion; @@ -1209,8 +1216,8 @@ public abstract class AbstractAccessLogV private final boolean millis; /** - * if millis is true, write time in millis - %D - * if millis is false, write time in seconds - %T + * @param millis <code>true</code>, write time in millis - %D, + * if <code>false</code>, write time in seconds - %T */ public ElapsedTimeElement(boolean millis) { this.millis = millis; @@ -1477,7 +1484,8 @@ public abstract class AbstractAccessLogV /** - * parse pattern string and create the array of AccessLogElement + * Parse pattern string and create the array of AccessLogElement. + * @return the log elements array */ protected AccessLogElement[] createLogElements() { List<AccessLogElement> list = new ArrayList<>(); @@ -1526,7 +1534,10 @@ public abstract class AbstractAccessLogV } /** - * create an AccessLogElement implementation which needs an element name + * Create an AccessLogElement implementation which needs an element name. + * @param name Header name + * @param pattern char in the log pattern + * @return the log element */ protected AccessLogElement createAccessLogElement(String name, char pattern) { switch (pattern) { @@ -1550,7 +1561,9 @@ public abstract class AbstractAccessLogV } /** - * create an AccessLogElement implementation + * Create an AccessLogElement implementation. + * @param pattern char in the log pattern + * @return the log element */ protected AccessLogElement createAccessLogElement(char pattern) { switch (pattern) {
Modified: tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java?rev=1724626&r1=1724625&r2=1724626&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/AccessLogValve.java Thu Jan 14 14:55:44 2016 @@ -160,7 +160,7 @@ public class AccessLogValve extends Abst /** - * Return the directory in which we create log files. + * @return the directory in which we create log files. */ public String getDirectory() { return (directory); @@ -178,6 +178,7 @@ public class AccessLogValve extends Abst /** * Check for file existence before logging. + * @return <code>true</code> if file existence is checked first */ public boolean isCheckExists() { @@ -199,7 +200,7 @@ public class AccessLogValve extends Abst /** - * Return the log file prefix. + * @return the log file prefix. */ public String getPrefix() { return (prefix); @@ -217,7 +218,8 @@ public class AccessLogValve extends Abst /** - * Should we rotate the logs + * Should we rotate the logs. + * @return <code>true</code> if the logs are rotated */ public boolean isRotatable() { return rotatable; @@ -236,7 +238,9 @@ public class AccessLogValve extends Abst /** * Should we defer inclusion of the date stamp in the file - * name until rotate time + * name until rotate time. + * @return <code>true</code> if the logs file names are time stamped + * only when they are rotated */ public boolean isRenameOnRotate() { return renameOnRotate; @@ -255,7 +259,8 @@ public class AccessLogValve extends Abst /** - * Is the logging buffered + * Is the logging buffered. Usually buffering can increase performance. + * @return <code>true</code> if the logging uses a buffer */ public boolean isBuffered() { return buffered; @@ -265,7 +270,7 @@ public class AccessLogValve extends Abst /** * Set the value if the logging should be buffered * - * @param buffered true if buffered. + * @param buffered <code>true</code> if buffered. */ public void setBuffered(boolean buffered) { this.buffered = buffered; @@ -273,7 +278,7 @@ public class AccessLogValve extends Abst /** - * Return the log file suffix. + * @return the log file suffix. */ public String getSuffix() { return (suffix); @@ -290,7 +295,7 @@ public class AccessLogValve extends Abst } /** - * Return the date format date based log rotation. + * @return the date format date based log rotation. */ public String getFileDateFormat() { return fileDateFormat; @@ -298,7 +303,8 @@ public class AccessLogValve extends Abst /** - * Set the date format date based log rotation. + * Set the date format date based log rotation. + * @param fileDateFormat The format for the file timestamp */ public void setFileDateFormat(String fileDateFormat) { String newFormat; @@ -386,7 +392,6 @@ public class AccessLogValve extends Abst * old log file name up once again. Intended to be called by a JMX * agent. * - * * @param newFileName The file name to move the log file entry to * @return true if a file was rotated with no error */ Modified: tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java?rev=1724626&r1=1724625&r2=1724626&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/ErrorReportValve.java Thu Jan 14 14:55:44 2016 @@ -288,6 +288,8 @@ public class ErrorReportValve extends Va /** * Print out a partial servlet stack trace (truncating at the last * occurrence of javax.servlet.). + * @param t The stack trace to process + * @return the stack trace relative to the application layer */ protected String getPartialServletStackTrace(Throwable t) { StringBuilder trace = new StringBuilder(); @@ -314,7 +316,7 @@ public class ErrorReportValve extends Va /** * Enables/Disables full error reports * - * @param showReport + * @param showReport <code>true</code> to show full error data */ public void setShowReport(boolean showReport) { this.showReport = showReport; @@ -327,7 +329,7 @@ public class ErrorReportValve extends Va /** * Enables/Disables server info on error pages * - * @param showServerInfo + * @param showServerInfo <code>true</code> to show server info */ public void setShowServerInfo(boolean showServerInfo) { this.showServerInfo = showServerInfo; Modified: tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java?rev=1724626&r1=1724625&r2=1724626&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/JDBCAccessLogValve.java Thu Jan 14 14:55:44 2016 @@ -165,7 +165,7 @@ public final class JDBCAccessLogValve ex * Use long contentLength as you have more 4 GB output. * @since 6.0.15 */ - boolean useLongContentLength = false ; + boolean useLongContentLength = false; /** * The connection username to use when trying to connect to the database. @@ -232,8 +232,7 @@ public final class JDBCAccessLogValve ex } /** - * Return the username to use to connect to the database. - * + * @return the username to use to connect to the database. */ public String getConnectionName() { return connectionName; @@ -257,9 +256,8 @@ public final class JDBCAccessLogValve ex this.driverName = driverName; } - /** - * Return the password to use to connect to the database. - * + /** + * @return the password to use to connect to the database. */ public String getConnectionPassword() { return connectionPassword; @@ -356,11 +354,11 @@ public final class JDBCAccessLogValve ex } - /** - * Sets the name of the field containing the HTTP response status code. - * - * @param statusField The name of the HTTP response status code field. - */ + /** + * Sets the name of the field containing the HTTP response status code. + * + * @param statusField The name of the HTTP response status code field. + */ public void setStatusField(String statusField) { this.statusField = statusField; } @@ -420,10 +418,11 @@ public final class JDBCAccessLogValve ex } /** - * get useLongContentLength + * @return <code>true</code> if content length should be considered a long + * rather than an int, defaults to <code>false</code> */ - public boolean getUseLongContentLength() { - return this.useLongContentLength ; + public boolean getUseLongContentLength() { + return this.useLongContentLength; } /** Modified: tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java?rev=1724626&r1=1724625&r2=1724626&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/PersistentValve.java Thu Jan 14 14:55:44 2016 @@ -200,6 +200,9 @@ public class PersistentValve extends Val * than its expiration date as of the supplied time. * * FIXME: Probably belongs in the Session class. + * @param session The session to check + * @param timeNow The current time to check for + * @return <code>true</code> if the session is past its expiration */ protected boolean isSessionStale(Session session, long timeNow) { Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java?rev=1724626&r1=1724625&r2=1724626&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/RemoteAddrValve.java Thu Jan 14 14:55:44 2016 @@ -50,6 +50,8 @@ public final class RemoteAddrValve exten * Get the flag deciding whether we add the server connector port to the * property compared in the filtering method. The port will be appended * using a ";" as a separator. + * @return <code>true</code> to add the connector port, the default is + * <code>false</code> */ public boolean getAddConnectorPort() { return addConnectorPort; Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteHostValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteHostValve.java?rev=1724626&r1=1724625&r2=1724626&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/RemoteHostValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/RemoteHostValve.java Thu Jan 14 14:55:44 2016 @@ -50,6 +50,7 @@ public final class RemoteHostValve exten * Get the flag deciding whether we add the server connector port to the * property compared in the filtering method. The port will be appended * using a ";" as a separator. + * @return <code>true</code> to add the connector port */ public boolean getAddConnectorPort() { return addConnectorPort; Modified: tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1724626&r1=1724625&r2=1724626&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Thu Jan 14 14:55:44 2016 @@ -144,7 +144,6 @@ import org.apache.tomcat.util.http.MimeH * </tr> * </table> * <p> - * <p> * This Valve may be attached to any Container, depending on the granularity of the filtering you wish to perform. * </p> * <p> @@ -361,7 +360,7 @@ public class RemoteIpValve extends Valve /** * Convert a given comma delimited String into an array of String - * + * @param commaDelimitedStrings The string to convert * @return array of String (non <code>null</code>) */ protected static String[] commaDelimitedListToStringArray(String commaDelimitedStrings) { @@ -371,6 +370,8 @@ public class RemoteIpValve extends Valve /** * Convert an array of strings in a comma delimited string + * @param stringList The string list to convert + * @return The concatenated string */ protected static String listToCommaDelimitedString(List<String> stringList) { if (stringList == null) { @@ -729,6 +730,7 @@ public class RemoteIpValve extends Valve * <p> * Default value : 80 * </p> + * @param httpServerPort The server port */ public void setHttpServerPort(int httpServerPort) { this.httpServerPort = httpServerPort; @@ -741,6 +743,7 @@ public class RemoteIpValve extends Valve * <p> * Default value : 443 * </p> + * @param httpsServerPort The server port */ public void setHttpsServerPort(int httpsServerPort) { this.httpsServerPort = httpsServerPort; @@ -753,6 +756,7 @@ public class RemoteIpValve extends Valve * <p> * Default value : 10\.\d{1,3}\.\d{1,3}\.\d{1,3}|192\.168\.\d{1,3}\.\d{1,3}|169\.254.\d{1,3}.\d{1,3}|127\.\d{1,3}\.\d{1,3}\.\d{1,3} * </p> + * @param internalProxies The proxy regular expression */ public void setInternalProxies(String internalProxies) { if (internalProxies == null || internalProxies.length() == 0) { @@ -770,6 +774,7 @@ public class RemoteIpValve extends Valve * <p> * Default value : <code>null</code> * </p> + * @param protocolHeader The header name */ public void setProtocolHeader(String protocolHeader) { this.protocolHeader = protocolHeader; @@ -782,6 +787,7 @@ public class RemoteIpValve extends Valve * <p> * Default value : <code>https</code> * </p> + * @param protocolHeaderHttpsValue The header name */ public void setProtocolHeaderHttpsValue(String protocolHeaderHttpsValue) { this.protocolHeaderHttpsValue = protocolHeaderHttpsValue; @@ -802,6 +808,7 @@ public class RemoteIpValve extends Valve * <p> * Default value : <code>X-Forwarded-By</code> * </p> + * @param proxiesHeader The header name */ public void setProxiesHeader(String proxiesHeader) { this.proxiesHeader = proxiesHeader; @@ -818,7 +825,7 @@ public class RemoteIpValve extends Valve * Default value : <code>X-Forwarded-For</code> * </p> * - * @param remoteIpHeader + * @param remoteIpHeader The header name */ public void setRemoteIpHeader(String remoteIpHeader) { this.remoteIpHeader = remoteIpHeader; @@ -855,6 +862,7 @@ public class RemoteIpValve extends Valve * <p> * Default value : empty list, no external proxy is trusted. * </p> + * @param trustedProxies The regular expression */ public void setTrustedProxies(String trustedProxies) { if (trustedProxies == null || trustedProxies.length() == 0) { Modified: tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java?rev=1724626&r1=1724625&r2=1724626&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/RequestFilterValve.java Thu Jan 14 14:55:44 2016 @@ -137,6 +137,7 @@ public abstract class RequestFilterValve /** * Return the regular expression used to test for allowed requests for this * Valve, if any; otherwise, return <code>null</code>. + * @return the regular expression */ public String getAllow() { return allowValue; @@ -170,6 +171,7 @@ public abstract class RequestFilterValve /** * Return the regular expression used to test for denied requests for this * Valve, if any; otherwise, return <code>null</code>. + * @return the regular expression */ public String getDeny() { return denyValue; @@ -204,6 +206,7 @@ public abstract class RequestFilterValve * Returns {@code false} if the last change to the {@code allow} pattern did * not apply successfully. E.g. if the pattern is syntactically * invalid. + * @return <code>false</code> if the current pattern is invalid */ public final boolean isAllowValid() { return allowValid; @@ -214,6 +217,7 @@ public abstract class RequestFilterValve * Returns {@code false} if the last change to the {@code deny} pattern did * not apply successfully. E.g. if the pattern is syntactically * invalid. + * @return <code>false</code> if the current pattern is invalid */ public final boolean isDenyValid() { return denyValid; @@ -221,7 +225,7 @@ public abstract class RequestFilterValve /** - * Return response status code that is used to reject denied request. + * @return response status code that is used to reject denied request. */ public int getDenyStatus() { return denyStatus; @@ -230,6 +234,7 @@ public abstract class RequestFilterValve /** * Set response status code that is used to reject denied request. + * @param denyStatus The status code */ public void setDenyStatus(int denyStatus) { this.denyStatus = denyStatus; @@ -237,7 +242,7 @@ public abstract class RequestFilterValve /** - * Return true if a deny is handled by setting an invalid auth header. + * @return <code>true</code> if a deny is handled by setting an invalid auth header. */ public boolean getInvalidAuthenticationWhenDeny() { return invalidAuthenticationWhenDeny; @@ -246,6 +251,7 @@ public abstract class RequestFilterValve /** * Set invalidAuthenticationWhenDeny property. + * @param value <code>true</code> to handle a deny by setting an invalid auth header */ public void setInvalidAuthenticationWhenDeny(boolean value) { invalidAuthenticationWhenDeny = value; @@ -352,8 +358,8 @@ public abstract class RequestFilterValve * called through JMX, e.g. to test whether certain IP address is allowed or * denied by the valve configuration. * - * @param property - * The request property value on which to filter + * @param property The request property value on which to filter + * @return <code>true</code> if the request is allowed */ public boolean isAllowed(String property) { // Use local copies for thread safety Modified: tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java?rev=1724626&r1=1724625&r2=1724626&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/SemaphoreValve.java Thu Jan 14 14:55:44 2016 @@ -172,8 +172,10 @@ public class SemaphoreValve extends Valv /** * Subclass friendly method to add conditions. - * @param request - * @param response + * @param request The Servlet request + * @param response The Servlet response + * @return <code>true</code> if the concurrency control should occur + * on this request */ public boolean controlConcurrency(Request request, Response response) { return true; @@ -183,10 +185,10 @@ public class SemaphoreValve extends Valv /** * Subclass friendly method to add error handling when a permit isn't * granted. - * @param request - * @param response - * @throws IOException - * @throws ServletException + * @param request The Servlet request + * @param response The Servlet response + * @throws IOException Error writing output + * @throws ServletException Other error */ public void permitDenied(Request request, Response response) throws IOException, ServletException { Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java?rev=1724626&r1=1724625&r2=1724626&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java Thu Jan 14 14:55:44 2016 @@ -183,6 +183,8 @@ public class RewriteCond { * * @param rule corresponding matched rule * @param cond last matched condition + * @param resolver Property resolver + * @return <code>true</code> if the condition matches */ public boolean evaluate(Matcher rule, Matcher cond, Resolver resolver) { String value = test.evaluate(rule, cond, resolver); Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java?rev=1724626&r1=1724625&r2=1724626&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java Thu Jan 14 14:55:44 2016 @@ -76,8 +76,9 @@ public class RewriteRule { /** * Evaluate the rule based on the context - * - * @return null if no rewrite took place + * @param url The char sequence + * @param resolver Property resolver + * @return <code>null</code> if no rewrite took place */ public CharSequence evaluate(CharSequence url, Resolver resolver) { Pattern pattern = this.pattern.get(); Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1724626&r1=1724625&r2=1724626&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java Thu Jan 14 14:55:44 2016 @@ -487,7 +487,7 @@ public class RewriteValve extends ValveB /** - * Get config base. + * @return config base. */ protected File getConfigBase() { File configBase = @@ -503,8 +503,8 @@ public class RewriteValve extends ValveB /** * Find the configuration path where the rewrite configuration file * will be stored. - * - * @param resourceName + * @param resourceName The rewrite configuration file name + * @return the full rewrite configuration path */ protected String getHostConfigPath(String resourceName) { StringBuffer result = new StringBuffer(); @@ -536,7 +536,6 @@ public class RewriteValve extends ValveB * RewriteCond %{REMOTE_HOST} ^host1.* [OR] * * @param line A line from the rewrite configuration - * * @return The condition, rule or map resulting from parsing the line */ public static Object parse(String line) { @@ -613,9 +612,9 @@ public class RewriteValve extends ValveB /** * Parser for RewriteCond flags. - * - * @param condition - * @param flag + * @param line The configuration line being parsed + * @param condition The current condition + * @param flag The flag */ protected static void parseCondFlag(String line, RewriteCond condition, String flag) { if (flag.equals("NC") || flag.equals("nocase")) { @@ -630,9 +629,9 @@ public class RewriteValve extends ValveB /** * Parser for ReweriteRule flags. - * - * @param rule - * @param flag + * @param line The configuration line being parsed + * @param rule The current rule + * @param flag The flag */ protected static void parseRuleFlag(String line, RewriteRule rule, String flag) { if (flag.equals("chain") || flag.equals("C")) { Modified: tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java?rev=1724626&r1=1724625&r2=1724626&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java (original) +++ tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java Thu Jan 14 14:55:44 2016 @@ -227,10 +227,11 @@ public class Substitution { } /** - * Evaluate the substitution based on the context - * + * Evaluate the substitution based on the context. * @param rule corresponding matched rule * @param cond last matched condition + * @param resolver The property resolver + * @return The substitution result */ public String evaluate(Matcher rule, Matcher cond, Resolver resolver) { StringBuffer buf = new StringBuffer(); Modified: tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1724626&r1=1724625&r2=1724626&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java (original) +++ tomcat/trunk/java/org/apache/catalina/webresources/StandardRoot.java Thu Jan 14 14:55:44 2016 @@ -560,7 +560,7 @@ public class StandardRoot extends Lifecy this.context = context; } - /* + /** * Class loader resources are handled by treating JARs in WEB-INF/lib as * resource JARs (without the internal META-INF/resources/ prefix) mounted * at WEB-INF/claasses (rather than the web app root). This enables reuse @@ -583,7 +583,8 @@ public class StandardRoot extends Lifecy } /** - * For unit testing + * For unit testing. + * @param main The main resources */ protected final void setMainResources(WebResourceSet main) { this.main = main; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
