Author: csutherl
Date: Fri Jul 14 20:14:50 2017
New Revision: 1801987
URL: http://svn.apache.org/viewvc?rev=1801987&view=rev
Log:
Porting r1631350 to tomcat7: Use UTF-8 to fix ASCII art in Javadoc. How ironic.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java
tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java?rev=1801987&r1=1801986&r2=1801987&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/Lifecycle.java Fri Jul 14
20:14:50 2017
@@ -30,30 +30,30 @@ package org.apache.catalina;
* -----------------------------
* | |
* | init() |
- * NEW ->-- INITIALIZING |
- * | | | |
------------------<-----------------------
+ * NEW -»-- INITIALIZING |
+ * | | | |
------------------«-----------------------
* | | |auto | |
|
* | | \|/ start() \|/ \|/ auto auto stop()
|
- * | | INITIALIZED -->-- STARTING_PREP -->- STARTING -->- STARTED -->---
|
+ * | | INITIALIZED --»-- STARTING_PREP --»- STARTING --»- STARTED
--»--- |
* | | | |
|
* | |destroy()| |
|
- * | -->-----<-- ------------------------<--------------------------------
^
+ * | --»-----«--
------------------------«-------------------------------- ^
* | | |
|
* | | \|/ auto auto start()
|
- * | | STOPPING_PREP ---->---- STOPPING ------>----- STOPPED
----->-----
+ * | | STOPPING_PREP ----»---- STOPPING ------»----- STOPPED
-----»-----
* | \|/ ^ | ^
* | | stop() | | |
* | | -------------------------- | |
* | | | | |
* | | | destroy() destroy() | |
- * | | FAILED ---->------ DESTROYING ---<----------------- |
+ * | | FAILED ----»------ DESTROYING ---«----------------- |
* | | ^ | |
* | | destroy() | |auto |
- * | -------->----------------- \|/ |
+ * | --------»----------------- \|/ |
* | DESTROYED |
* | |
* | stop() |
- * --->------------------------------>------------------------------
+ * ---»------------------------------»------------------------------
*
* Any state can transition to FAILED.
*
Modified: tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java?rev=1801987&r1=1801986&r2=1801987&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/coyote/AsyncStateMachine.java Fri Jul
14 20:14:50 2017
@@ -74,35 +74,35 @@ import org.apache.tomcat.util.security.P
* is called.
* ERROR - Something went wrong.
*
- * |----------------->------|
|--«--------MUST_ERROR---------------«------------------------|
+ * |-----------------»------|
|--«--------MUST_ERROR---------------«------------------------|
* | \|/\|/
|
- * | |----------<-----E R R O
R<-------------------------<-------------------------------| |
- * | | complete() /|\/|\\ \--<---------------------------------<-----|
| ^
+ * | |----------«-----E R R O
R<-------------------------«-------------------------------| |
+ * | | complete() /|\/|\\
\--«---------------------------------«-----| | ^
* | | | | \ |
| |
- * | | |----->-------| | \----------->----------| |
| |
+ * | | |-----»-------| | \-----------»----------|
| | |
* | | | | |dispatch() |
| |
* | | | | \|/ ^
| |
* | | | | |--|timeout() | |
| |
* | | | post() | | \|/ | post() |
| |
* | | | |---------- | -->DISPATCHED<---------- |
--------------COMPLETING<-----| | |
* | | | | | /|\/|\ | | | /|\
/|\ | | |
- * | | | | |--->- | ---| | |startAsync() | timeout()|--|
| | | |
+ * | | | | |---»- | ---| | |startAsync() | timeout()|--|
| | | |
* | | ^ ^ | | | | |
| | ^ |
* | | | | | |-- \ -----| | complete() |
|post() | | |
- * | | | | | | \ | /-->----- |
---COMPLETE_PENDING->-| | | |
+ * | | | | | | \ | /--»----- |
---COMPLETE_PENDING-»-| | | |
* | | | | | | \ | / |
| | |
* | | | | | ^ \ | / |
| | |
* | \|/ | | | | \ \|/ / post() |
| | |
- * | MUST_COMPLETE-<- | - | --<----STARTING-->--------- | -------------|
^ | |
+ * | MUST_COMPLETE-«- | - | --«----STARTING--»--------- | -------------|
^ | |
* | /|\ | | complete() | \ | |
complete() | | |
* | | | | | \ | post() |
/----------| | |
* | | ^ | dispatch()| \ | |-----| | /
| |
* | | | | | \ | | | | /
| |
* | | | | \|/ \ | | \|/ \|/ /
| ^
- * | | | |--<--MUST_DISPATCH-----<-----|
|--<--STARTED--->-------------| |
+ * | | | |--«--MUST_DISPATCH-----«-----|
|--«--STARTED---»-------------| |
* | | | dispatched() /|\ | \ / | \
|
* | | | | | \ / | \
nct-io-error |
- * | | | | | \ / |
\---->-----------|
+ * | | | | | \ / |
\----»-----------|
* | | | | |post() \ | |
* ^ ^ | | | \|/ | |
* | | ^ | | DISPATCH_PENDING | |
@@ -112,18 +112,18 @@ import org.apache.tomcat.util.security.P
* | | | | | | | |
* | | |post() | | | | timeout()|
* | | |dispatched() | \|/\|/ \|/ |
- * | | |---<---------- | ---DISPATCHING |
+ * | | |---«---------- | ---DISPATCHING |
* | | | | ^ |
* | | | |----| |
* | | | timeout() |
* | | | |
* | | | dispatch() \|/
- * | | |-----------<-----------TIMING_OUT
+ * | | |-----------«-----------TIMING_OUT
* | | | |
- * | |-------<----------------------------------<------| |
+ * | |-------«----------------------------------«------| |
* | complete() |
* | |
- * |<--------<-------------------<-------------------------------<--|
+ * |<--------«-------------------«-------------------------------«--|
* error()
* </pre>
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
