Author: markt
Date: Mon Dec 10 17:13:02 2018
New Revision: 1848605
URL: http://svn.apache.org/viewvc?rev=1848605&view=rev
Log:
Revert accidental commit r1848604
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties?rev=1848605&r1=1848604&r2=1848605&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
[UTF-8] (original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/LocalStrings.properties
[UTF-8] Mon Dec 10 17:13:02 2018
@@ -21,7 +21,7 @@ backupManager.stopped=Manager [{0}] is s
clusterSessionListener.noManager=Context manager doesn''t exist:[{0}]
deltaManager.createMessage.access=Manager [{0}]: create session access message
for session [{1}]
-deltaManager.createMessage.accessChangePrimary=Manager [{0}]: create change
primary code message for session [{1}].
+deltaManager.createMessage.accessChangePrimary=Manager [{0}]: create change
primary node message for session [{1}]
deltaManager.createMessage.allSessionData=Manager [{0}] sent all session data.
deltaManager.createMessage.allSessionTransfered=Manager [{0}] sent all session
data transferred
deltaManager.createMessage.delta=Manager [{0}]: create delta request message
for session [{1}]
@@ -40,15 +40,15 @@ deltaManager.noContextManager=Manager [{
deltaManager.noMasterMember=Starting... with no other member for context [{0}]
at domain [{1}]
deltaManager.noMembers=Manager [{0}]: skipping state transfer. No members
active in cluster group.
deltaManager.noSessionState=Manager [{0}]: No session state sent at [{1}]
received, timing out after [{2}] ms.
-deltaManager.receiveMessage.accessed=Manager [{0}]: received session [{1}]
accessed.
-deltaManager.receiveMessage.allSessionDataAfter=Manager [{0}]: session state
deserialized
-deltaManager.receiveMessage.allSessionDataBegin=Manager [{0}]: received
session state data
-deltaManager.receiveMessage.createNewSession=Manager [{0}]: received session
[{1}] created.
-deltaManager.receiveMessage.delta=Manager [{0}]: received session [{1}] delta.
-deltaManager.receiveMessage.delta.unknown=Manager [{0}]: received unknown
session [{1}] delta.
+deltaManager.receiveMessage.accessed=Manager [{0}]: received session accessed
message for session [{1}]
+deltaManager.receiveMessage.allSessionDataAfter=Manager [{0}]: all session
state deserialized
+deltaManager.receiveMessage.allSessionDataBegin=Manager [{0}]: received all
session state data
+deltaManager.receiveMessage.createNewSession=Manager [{0}]: received session
created message for session [{1}]
+deltaManager.receiveMessage.delta=Manager [{0}]: received session delta
message for session [{1}]
+deltaManager.receiveMessage.delta.unknown=Manager [{0}]: received session
delta for unknown session [{1}]
deltaManager.receiveMessage.error=Manager [{0}]: Unable to receive message
through TCP channel
deltaManager.receiveMessage.eventType=Manager [{0}]: Received SessionMessage
of type=[{1}] from [{2}]
-deltaManager.receiveMessage.expired=Manager [{0}]: received session [{1}]
expired.
+deltaManager.receiveMessage.expired=Manager [{0}]: received session expired
message for session [{1}]
deltaManager.receiveMessage.noContextManager=Manager [{0}] received from node
[{1}:{2}] no context manager.
deltaManager.receiveMessage.transfercomplete=Manager [{0}] received from node
[{1}:{2}] session state transfered.
deltaManager.receiveMessage.unloadingAfter=Manager [{0}]: unloading sessions
complete
Modified: tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java?rev=1848605&r1=1848604&r2=1848605&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/buildutil/translate/Import.java Mon Dec
10 17:13:02 2018
@@ -46,7 +46,7 @@ public class Import {
// Skip the original
if (language.length() == 0) {
// Comment this line out if the originals needs to be exported.
- return;
+ //return;
}
Properties props = Utils.load(f);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
