Author: kfujino
Date: Mon Mar 6 08:44:39 2017
New Revision: 1785607
URL: http://svn.apache.org/viewvc?rev=1785607&view=rev
Log:
Remove unnecessary code.
ApplicationContext has been created in super.startInternal().
The alternate deployment descriptor name attribute has been set in previous
getServletContext().
Modified:
tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
Modified:
tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java?rev=1785607&r1=1785606&r2=1785607&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/context/ReplicatedContext.java Mon
Mar 6 08:44:39 2017
@@ -59,14 +59,12 @@ public class ReplicatedContext extends S
super.startInternal();
try {
CatalinaCluster catclust = (CatalinaCluster)this.getCluster();
- if (this.context == null) this.context = new ReplApplContext(this);
if ( catclust != null ) {
ReplicatedMap<String,Object> map = new ReplicatedMap<>(
this, catclust.getChannel(),DEFAULT_REPL_TIMEOUT,
getName(),getClassLoaders());
map.setChannelSendOptions(mapSendOptions);
((ReplApplContext)this.context).setAttributeMap(map);
- if (getAltDDName() != null)
context.setAttribute(Globals.ALT_DD_ATTR, getAltDDName());
}
} catch ( Exception x ) {
log.error(sm.getString("replicatedContext.startUnable",
getName()),x);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
