You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by vi...@apache.org on 2017/01/10 18:19:18 UTC
svn commit: r1778170 [2/2] - in /tomcat/tc8.0.x/trunk: ./
java/org/apache/catalina/ant/jmx/ java/org/apache/catalina/authenticator/
java/org/apache/catalina/connector/ java/org/apache/catalina/core/
java/org/apache/catalina/deploy/ java/org/apache/cata...
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java?rev=1778170&r1=1778169&r2=1778170&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java Tue Jan 10 18:19:17 2017
@@ -165,7 +165,7 @@ public abstract class AbstractReplicated
/**
* Creates a new map
* @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
+ * @param timeout long - timeout for RPC messages
* @param mapContextName String - unique name for this map, to allow multiple maps per channel
* @param initialCapacity int - the size of this map, see HashMap
* @param loadFactor float - load factor, see HashMap
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java?rev=1778170&r1=1778169&r2=1778170&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/LazyReplicatedMap.java Tue Jan 10 18:19:17 2017
@@ -57,7 +57,7 @@ import org.apache.juli.logging.LogFactor
* each time the object gets replicated the entire object gets serialized, hence a call to <code>replicate(true)</code>
* will replicate all objects in this map that are using this node as primary.
*
- * <br><br><b>REMBER TO CALL</b> <code>breakdown()</code> or <code>finalize()</code> when you are done with the map to
+ * <br><br><b>REMEMBER TO CALL</b> <code>breakdown()</code> or <code>finalize()</code> when you are done with the map to
* avoid memory leaks.<br><br>
* TODO implement periodic sync/transfer thread
* @version 1.0
@@ -73,7 +73,7 @@ public class LazyReplicatedMap<K,V> exte
/**
* Creates a new map
* @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
+ * @param timeout long - timeout for RPC messages
* @param mapContextName String - unique name for this map, to allow multiple maps per channel
* @param initialCapacity int - the size of this map, see HashMap
* @param loadFactor float - load factor, see HashMap
@@ -85,7 +85,7 @@ public class LazyReplicatedMap<K,V> exte
/**
* Creates a new map
* @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
+ * @param timeout long - timeout for RPC messages
* @param mapContextName String - unique name for this map, to allow multiple maps per channel
* @param initialCapacity int - the size of this map, see HashMap
*/
@@ -96,7 +96,7 @@ public class LazyReplicatedMap<K,V> exte
/**
* Creates a new map
* @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
+ * @param timeout long - timeout for RPC messages
* @param mapContextName String - unique name for this map, to allow multiple maps per channel
*/
public LazyReplicatedMap(MapOwner owner, Channel channel, long timeout, String mapContextName, ClassLoader[] cls) {
@@ -106,7 +106,7 @@ public class LazyReplicatedMap<K,V> exte
/**
* Creates a new map
* @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
+ * @param timeout long - timeout for RPC messages
* @param mapContextName String - unique name for this map, to allow multiple maps per channel
* @param terminate boolean - Flag for whether to terminate this map that failed to start.
*/
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java?rev=1778170&r1=1778169&r2=1778170&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/tipis/ReplicatedMap.java Tue Jan 10 18:19:17 2017
@@ -65,7 +65,7 @@ public class ReplicatedMap<K,V> extends
/**
* Creates a new map
* @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
+ * @param timeout long - timeout for RPC messages
* @param mapContextName String - unique name for this map, to allow multiple maps per channel
* @param initialCapacity int - the size of this map, see HashMap
* @param loadFactor float - load factor, see HashMap
@@ -77,7 +77,7 @@ public class ReplicatedMap<K,V> extends
/**
* Creates a new map
* @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
+ * @param timeout long - timeout for RPC messages
* @param mapContextName String - unique name for this map, to allow multiple maps per channel
* @param initialCapacity int - the size of this map, see HashMap
*/
@@ -88,7 +88,7 @@ public class ReplicatedMap<K,V> extends
/**
* Creates a new map
* @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
+ * @param timeout long - timeout for RPC messages
* @param mapContextName String - unique name for this map, to allow multiple maps per channel
*/
public ReplicatedMap(MapOwner owner, Channel channel, long timeout, String mapContextName, ClassLoader[] cls) {
@@ -98,7 +98,7 @@ public class ReplicatedMap<K,V> extends
/**
* Creates a new map
* @param channel The channel to use for communication
- * @param timeout long - timeout for RPC messags
+ * @param timeout long - timeout for RPC messages
* @param mapContextName String - unique name for this map, to allow multiple maps per channel
* @param terminate boolean - Flag for whether to terminate this map that failed to start.
*/
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java?rev=1778170&r1=1778169&r2=1778170&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/BioReplicationTask.java Tue Jan 10 18:19:17 2017
@@ -102,7 +102,7 @@ public class BioReplicationTask extends
/**
* Use send ack here if you want to ack the request to the remote
* server before completing the request
- * This is considered an asynchronized request
+ * This is considered an asynchronous request
*/
if (ChannelData.sendAckAsync(msgs[i].getOptions())) sendAck(Constants.ACK_COMMAND);
try {
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties?rev=1778170&r1=1778169&r2=1778170&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/bio/LocalStrings.properties Tue Jan 10 18:19:17 2017
@@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-bioReceiver.threadpool.fail=ThreadPool can initilzed. Listener not started
+bioReceiver.threadpool.fail=ThreadPool can initialized. Listener not started
bioReceiver.start.fail=Unable to start cluster receiver
bioReceiver.socket.closeFailed=Failed to close socket
bioReceiver.run.fail=Unable to run replication listener.
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java?rev=1778170&r1=1778169&r2=1778170&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/tribes/transport/nio/NioReplicationTask.java Tue Jan 10 18:19:17 2017
@@ -198,7 +198,7 @@ public class NioReplicationTask extends
/**
* Use send ack here if you want to ack the request to the remote
* server before completing the request
- * This is considered an asynchronized request
+ * This is considered an asynchronous request
*/
if (ChannelData.sendAckAsync(msgs[i].getOptions())) sendAck(key,(WritableByteChannel)channel,Constants.ACK_COMMAND,saddr);
try {
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java?rev=1778170&r1=1778169&r2=1778170&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/util/ExtensionValidator.java Tue Jan 10 18:19:17 2017
@@ -112,7 +112,7 @@ public final class ExtensionValidator {
* file in the /META-INF/ directory of the application and all
* MANIFEST.MF files in each JAR file located in the WEB-INF/lib
* directory and creates an <code>ArrayList</code> of
- * <code>ManifestResorce</code> objects. These objects are then passed
+ * <code>ManifestResource</code> objects. These objects are then passed
* to the validateManifestResources method for validation.
*
* @param resources The resources configured for this Web Application
@@ -283,7 +283,7 @@ public final class ExtensionValidator {
* Build this list of available extensions so that we do not have to
* re-build this list every time we iterate through the list of required
* extensions. All available extensions in all of the
- * <code>MainfestResource</code> objects will be added to a
+ * <code>ManifestResource</code> objects will be added to a
* <code>HashMap</code> which is returned on the first dependency list
* processing pass.
*
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java?rev=1778170&r1=1778169&r2=1778170&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/RemoteIpValve.java Tue Jan 10 18:19:17 2017
@@ -764,7 +764,7 @@ public class RemoteIpValve extends Valve
/**
* <p>
- * Header that holds the incoming protocol, usally named <code>X-Forwarded-Proto</code>. If <code>null</code>, request.scheme and
+ * Header that holds the incoming protocol, usually named <code>X-Forwarded-Proto</code>. If <code>null</code>, request.scheme and
* request.secure will not be modified.
* </p>
* <p>
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java?rev=1778170&r1=1778169&r2=1778170&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/StuckThreadDetectionValve.java Tue Jan 10 18:19:17 2017
@@ -60,7 +60,7 @@ public class StuckThreadDetectionValve e
private final AtomicInteger stuckCount = new AtomicInteger(0);
/**
- * Keeps count of the number of stuck threads that have been interruoted
+ * Keeps count of the number of stuck threads that have been interrupted
*/
private AtomicLong interruptedThreadsCount = new AtomicLong();
@@ -77,7 +77,7 @@ public class StuckThreadDetectionValve e
/**
* The only references we keep to actual running Thread objects are in
* this Map (which is automatically cleaned in invoke()s finally clause).
- * That way, Threads can be GC'ed, eventhough the Valve still thinks they
+ * That way, Threads can be GC'ed, even though the Valve still thinks they
* are stuck (caused by a long monitor interval)
*/
private final Map<Long, MonitoredThread> activeThreads = new ConcurrentHashMap<>();
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java?rev=1778170&r1=1778169&r2=1778170&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java Tue Jan 10 18:19:17 2017
@@ -731,7 +731,7 @@ public class RewriteValve extends ValveB
/**
- * Parser for ReweriteRule flags.
+ * Parser for RewriteRule flags.
*
* @param rule
* @param flag
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java?rev=1778170&r1=1778169&r2=1778170&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/StandardRoot.java Tue Jan 10 18:19:17 2017
@@ -237,7 +237,7 @@ public class StandardRoot extends Lifecy
* can be normalized without stepping outside of the root.
*
* @param path
- * @return the normlized path
+ * @return the normalized path
*/
private String validate(String path) {
if (!getState().isAvailable()) {
Modified: tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java
URL: http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java?rev=1778170&r1=1778169&r2=1778170&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java (original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/catalina/webresources/TomcatURLStreamHandlerFactory.java Tue Jan 10 18:19:17 2017
@@ -27,7 +27,7 @@ import org.apache.catalina.webresources.
public class TomcatURLStreamHandlerFactory implements URLStreamHandlerFactory {
private static final String WAR_PROTOCOL = "war";
- private static final String CLASSPTH_PROTOCOL = "classpath";
+ private static final String CLASSPATH_PROTOCOL = "classpath";
// Singleton instance
private static volatile TomcatURLStreamHandlerFactory instance = null;
@@ -158,7 +158,7 @@ public class TomcatURLStreamHandlerFacto
// it.
if (WAR_PROTOCOL.equals(protocol)) {
return new Handler();
- } else if (CLASSPTH_PROTOCOL.equals(protocol)) {
+ } else if (CLASSPATH_PROTOCOL.equals(protocol)) {
return new ClasspathURLStreamHandler();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org