Author: violetagg
Date: Thu Oct 13 08:49:27 2016
New Revision: 1764625
URL: http://svn.apache.org/viewvc?rev=1764625&view=rev
Log:
Fixed a warning message that is logged during Tomcat startup. Do not remove the
marker PropertyChangeListener as it might be used by custom session managers.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1764625&r1=1764624&r2=1764625&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
Thu Oct 13 08:49:27 2016
@@ -546,7 +546,6 @@ public class DeltaManager extends Cluste
// Register with the new Container (if any)
if ((this.container != null) && (this.container instanceof Context)) {
- setMaxInactiveInterval(((Context)
this.container).getSessionTimeout() * 60);
((Context) this.container).addPropertyChangeListener(this);
}
@@ -1151,19 +1150,7 @@ public class DeltaManager extends Cluste
* The property change event that has occurred
*/
public void propertyChange(PropertyChangeEvent event) {
-
- // Validate the source of this event
- if (!(event.getSource() instanceof Context))
- return;
- // Process a relevant property change
- if (event.getPropertyName().equals("sessionTimeout")) {
- try {
- setMaxInactiveInterval(((Integer)
event.getNewValue()).intValue() * 60);
- } catch (NumberFormatException e) {
- log.error(sm.getString("deltaManager.sessionTimeout",
event.getNewValue()));
- }
- }
-
+ // no-op
}
// -------------------------------------------------------- Replication
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties?rev=1764625&r1=1764624&r2=1764625&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings.properties
Thu Oct 13 08:49:27 2016
@@ -49,7 +49,6 @@ standardManager.loading=Loading persiste
standardManager.loading.cnfe=ClassNotFoundException while loading persisted
sessions: {0}
standardManager.loading.ioe=IOException while loading persisted sessions: {0}
standardManager.notStarted=Manager has not yet been started
-standardManager.sessionTimeout=Invalid session timeout setting {0}
standardManager.unloading=Saving persisted sessions to {0}
standardManager.unloading.debug=Unloading persisted sessions
standardManager.unloading.ioe=IOException while saving persisted sessions: {0}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_es.properties?rev=1764625&r1=1764624&r2=1764625&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_es.properties
Thu Oct 13 08:49:27 2016
@@ -43,7 +43,6 @@ standardManager.loading = Cargando sesio
standardManager.loading.cnfe = ClassNotFoundException al cargar sesiones
persistidas\: {0}
standardManager.loading.ioe = IOException al cargar sesiones persistidas\: {0}
standardManager.notStarted = A\u00FAn no se ha arrancado el Gestor
-standardManager.sessionTimeout = Valor inv\u00E1lido de Tiempo Agotado de
sesi\u00F3n {0}
standardManager.unloading = Salvando sesiones persistidas a {0}
standardManager.unloading.ioe = IOException al salvar sesiones persistidas\:
{0}
standardManager.managerLoad = Excepci\u00F3n cargando sesiones desde
almacenamiento persistente
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties?rev=1764625&r1=1764624&r2=1764625&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_fr.properties
Thu Oct 13 08:49:27 2016
@@ -43,7 +43,6 @@ standardManager.loading=Chargement des s
standardManager.loading.cnfe="ClassNotFoundException" lors du chargement de
sessions persistantes: {0}
standardManager.loading.ioe="IOException" lors du chargement de sessions
persistantes: {0}
standardManager.notStarted=Le "Manager" n''a pas encore \u00e9t\u00e9
d\u00e9marr\u00e9
-standardManager.sessionTimeout=R\u00e9glage du d\u00e9lai d''inactivit\u00e9
(timeout) de session invalide {0}
standardManager.unloading=Sauvegarde des sessions ayant persist\u00e9 vers {0}
standardManager.unloading.ioe="IOException" lors de la sauvegarde de sessions
persistantes: {0}
standardManager.managerLoad=Exception au chargement des sessions depuis le
stockage persistant (persistent storage)
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties?rev=1764625&r1=1764624&r2=1764625&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/LocalStrings_ja.properties
Thu Oct 13 08:49:27 2016
@@ -44,7 +44,6 @@ standardManager.loading={0} \u304b\u3089
standardManager.loading.cnfe=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u4e2d\u306bClassNotFoundException\u304c\u767a\u751f\u3057\u307e\u3057\u305f:
{0}
standardManager.loading.ioe=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u4e2d\u306eIOException\u3067\u3059:
{0}
standardManager.notStarted=\u30de\u30cd\u30fc\u30b8\u30e3\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093
-standardManager.sessionTimeout=\u7121\u52b9\u306a\u30bb\u30c3\u30b7\u30e7\u30f3\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8\u8a2d\u5b9a\u3067\u3059
{0}
standardManager.unloading=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u3092
{0} \u306b\u4fdd\u5b58\u3057\u307e\u3059
standardManager.unloading.ioe=\u6301\u7d9a\u3055\u308c\u305f\u30bb\u30c3\u30b7\u30e7\u30f3\u306e\u4fdd\u5b58\u4e2d\u306eIOException\u3067\u3059:
{0}
standardManager.managerLoad=\u6c38\u7d9a\u8a18\u61b6\u88c5\u7f6e\u304b\u3089\u30bb\u30c3\u30b7\u30e7\u30f3\u3092\u30ed\u30fc\u30c9\u4e2d\u306e\u4f8b\u5916\u3067\u3059
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=1764625&r1=1764624&r2=1764625&view=diff
==============================================================================
---
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
(original)
+++
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Thu Oct 13 08:49:27 2016
@@ -345,8 +345,6 @@ public abstract class PersistentManagerB
// Register with the new Container (if any)
if ((this.container != null) && (this.container instanceof Context)) {
- setMaxInactiveInterval
- ( ((Context) this.container).getSessionTimeout()*60 );
((Context) this.container).addPropertyChangeListener(this);
}
@@ -1055,23 +1053,7 @@ public abstract class PersistentManagerB
* @param event The property change event that has occurred
*/
public void propertyChange(PropertyChangeEvent event) {
-
- // Validate the source of this event
- if (!(event.getSource() instanceof Context))
- return;
- Context context = (Context) event.getSource();
-
- // Process a relevant property change
- if (event.getPropertyName().equals("sessionTimeout")) {
- try {
- setMaxInactiveInterval
- ( ((Integer) event.getNewValue()).intValue()*60 );
- } catch (NumberFormatException e) {
- log.error(sm.getString("standardManager.sessionTimeout",
- event.getNewValue().toString()));
- }
- }
-
+ // no-op
}
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java?rev=1764625&r1=1764624&r2=1764625&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/session/StandardManager.java
Thu Oct 13 08:49:27 2016
@@ -171,8 +171,6 @@ public class StandardManager
// Register with the new Container (if any)
if ((this.container != null) && (this.container instanceof Context)) {
- setMaxInactiveInterval
- ( ((Context) this.container).getSessionTimeout()*60 );
((Context) this.container).addPropertyChangeListener(this);
}
}
@@ -710,22 +708,7 @@ public class StandardManager
* @param event The property change event that has occurred
*/
public void propertyChange(PropertyChangeEvent event) {
-
- // Validate the source of this event
- if (!(event.getSource() instanceof Context))
- return;
-
- // Process a relevant property change
- if (event.getPropertyName().equals("sessionTimeout")) {
- try {
- setMaxInactiveInterval
- ( ((Integer) event.getNewValue()).intValue()*60 );
- } catch (NumberFormatException e) {
- log.error(sm.getString("standardManager.sessionTimeout",
- event.getNewValue().toString()));
- }
- }
-
+ // no-op
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1764625&r1=1764624&r2=1764625&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Oct 13 08:49:27 2016
@@ -44,7 +44,15 @@
<!-- Section names:
General, Catalina, Coyote, Jasper, Cluster, Web applications, Other
-->
-<section name="Tomcat 6.0.47">
+<section name="Tomcat 6.0.47 (violetagg)">
+ <subsection name="Catalina">
+ <changelog>
+ <fix>
+ Fixed a warning message that is logged during Tomcat startup.
+ (violetagg)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 6.0.46 (violetagg)">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
