Author: markt
Date: Wed Nov 17 16:26:23 2010
New Revision: 1036099
URL: http://svn.apache.org/viewvc?rev=1036099&view=rev
Log:
Reduce code duplication
Initialise the random number generator once in ManagerBase
Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java?rev=1036099&r1=1036098&r2=1036099&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/BackupManager.java Wed Nov
17 16:26:23 2010
@@ -151,8 +151,7 @@ public class BackupManager extends Clust
@Override
protected synchronized void startInternal() throws LifecycleException {
- // Force initialization of the random number generator
- generateSessionId();
+ super.startInternal();
try {
cluster.registerManager(this);
Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1036099&r1=1036098&r2=1036099&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Wed Nov
17 16:26:23 2010
@@ -737,8 +737,7 @@ public CatalinaCluster getCluster() {
@Override
protected synchronized void startInternal() throws LifecycleException {
- // Force initialization of the random number generator
- generateSessionId();
+ super.startInternal();
// Load unloaded sessions, if any
try {
Modified: tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java?rev=1036099&r1=1036098&r2=1036099&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java Wed Nov 17
16:26:23 2010
@@ -816,22 +816,29 @@ public abstract class ManagerBase extend
}
@Override
- protected void destroyInternal() throws LifecycleException {
- closeRandomFile();
- super.destroyInternal();
- }
-
- @Override
protected void initInternal() throws LifecycleException {
super.initInternal();
setDistributable(((Context) getContainer()).getDistributable());
+ }
- // Initialize random number generation
- getRandomBytes(new byte[16]);
+ @Override
+ protected void startInternal() throws LifecycleException {
+ // Force initialization of the random number generator
+ if (log.isDebugEnabled())
+ log.debug("Force random number initialization starting");
+ generateSessionId();
+ if (log.isDebugEnabled())
+ log.debug("Force random number initialization completed");
}
+ @Override
+ protected void destroyInternal() throws LifecycleException {
+ closeRandomFile();
+ super.destroyInternal();
+ }
+
/**
* Add this Session to the set of active Sessions for this Manager.
*
Modified:
tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java?rev=1036099&r1=1036098&r2=1036099&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/PersistentManagerBase.java
Wed Nov 17 16:26:23 2010
@@ -822,12 +822,7 @@ public abstract class PersistentManagerB
@Override
protected synchronized void startInternal() throws LifecycleException {
- // Force initialization of the random number generator
- if (log.isDebugEnabled())
- log.debug("Force random number initialization starting");
- generateSessionId();
- if (log.isDebugEnabled())
- log.debug("Force random number initialization completed");
+ super.startInternal();
if (store == null)
log.error("No Store configured, persistence disabled");
Modified: tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/session/StandardManager.java?rev=1036099&r1=1036098&r2=1036099&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/session/StandardManager.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/session/StandardManager.java Wed Nov
17 16:26:23 2010
@@ -458,13 +458,8 @@ public class StandardManager extends Man
@Override
protected synchronized void startInternal() throws LifecycleException {
- // Force initialization of the random number generator
- if (log.isDebugEnabled())
- log.debug("Force random number initialization starting");
- generateSessionId();
- if (log.isDebugEnabled())
- log.debug("Force random number initialization completed");
-
+ super.startInternal();
+
// Load unloaded sessions, if any
try {
load();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
