Author: markt
Date: Tue Feb 23 22:52:05 2010
New Revision: 915568
URL: http://svn.apache.org/viewvc?rev=915568&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48678
Having two server fields in the type hierarchy was causing unexpected behaviour
Modified:
tomcat/tc6.0.x/trunk/ (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc6.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb 23 22:52:05 2010
@@ -1,2 +1,2 @@
/tomcat:883362
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907825,908721,908759,909636,909875,910442,910471
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907825,908721,908759,909636,909875,910442,910471
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=915568&r1=915567&r2=915568&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 23 22:52:05 2010
@@ -96,13 +96,6 @@
The name should be the full name, not just the last component of it.
NamingContext.isWritable() will be broken otherwise.
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48678
- Having two server fields in the type hierarchy was causing unexpected
- behaviour
- http://svn.apache.org/viewvc?rev=907311&view=rev
- +1: markt, jfclere, fhanik
- -1:
-
* Mark the host-manager docs as todo
http://svn.apache.org/viewvc?rev=907513&view=rev
+1: markt, jfclere, fhanik
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java?rev=915568&r1=915567&r2=915568&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/Catalina.java Tue Feb
23 22:52:05 2010
@@ -33,7 +33,6 @@
import org.apache.catalina.Container;
import org.apache.catalina.Lifecycle;
import org.apache.catalina.LifecycleException;
-import org.apache.catalina.Server;
import org.apache.catalina.core.StandardServer;
import org.apache.tomcat.util.digester.Digester;
import org.apache.tomcat.util.digester.Rule;
@@ -82,12 +81,6 @@
/**
- * The server component we are starting or stopping
- */
- protected Server server = null;
-
-
- /**
* Are we starting a new server?
*/
protected boolean starting = false;
@@ -151,17 +144,6 @@
}
- /**
- * Set the server instance we are configuring.
- *
- * @param server The new server
- */
- public void setServer(Server server) {
-
- this.server = server;
-
- }
-
// ----------------------------------------------------------- Main Program
/**
@@ -398,7 +380,7 @@
arguments(arguments);
}
- if( server == null ) {
+ if( getServer() == null ) {
// Create and execute our Digester
Digester digester = createStopDigester();
digester.setClassLoader(Thread.currentThread().getContextClassLoader());
@@ -419,16 +401,16 @@
// Stop the existing server
try {
- if (server.getPort()>0) {
- String hostAddress =
InetAddress.getByName("localhost").getHostAddress();
- Socket socket = new Socket(hostAddress, server.getPort());
- OutputStream stream = socket.getOutputStream();
- String shutdown = server.getShutdown();
- for (int i = 0; i < shutdown.length(); i++)
- stream.write(shutdown.charAt(i));
- stream.flush();
- stream.close();
- socket.close();
+ if (getServer().getPort()>0) {
+ String hostAddress =
InetAddress.getByName("localhost").getHostAddress();
+ Socket socket = new Socket(hostAddress, getServer().getPort());
+ OutputStream stream = socket.getOutputStream();
+ String shutdown = getServer().getShutdown();
+ for (int i = 0; i < shutdown.length(); i++)
+ stream.write(shutdown.charAt(i));
+ stream.flush();
+ stream.close();
+ socket.close();
} else {
log.error(sm.getString("catalina.stopServer"));
System.exit(1);
@@ -535,9 +517,9 @@
initStreams();
// Start the new server
- if (server instanceof Lifecycle) {
+ if (getServer() instanceof Lifecycle) {
try {
- server.initialize();
+ getServer().initialize();
} catch (LifecycleException e) {
if
(Boolean.getBoolean("org.apache.catalina.startup.EXIT_ON_INIT_FAILURE"))
throw new java.lang.Error(e);
@@ -580,11 +562,11 @@
*/
public void start() {
- if (server == null) {
+ if (getServer() == null) {
load();
}
- if (server == null) {
+ if (getServer() == null) {
log.fatal("Cannot start server. Server instance is not
configured.");
return;
}
@@ -592,9 +574,9 @@
long t1 = System.nanoTime();
// Start the new server
- if (server instanceof Lifecycle) {
+ if (getServer() instanceof Lifecycle) {
try {
- ((Lifecycle) server).start();
+ ((Lifecycle) getServer()).start();
} catch (LifecycleException e) {
log.error("Catalina.start: ", e);
}
@@ -642,9 +624,9 @@
}
// Shut down the server
- if (server instanceof Lifecycle) {
+ if (getServer() instanceof Lifecycle) {
try {
- ((Lifecycle) server).stop();
+ ((Lifecycle) getServer()).stop();
} catch (LifecycleException e) {
log.error("Catalina.stop", e);
}
@@ -658,7 +640,7 @@
*/
public void await() {
- server.await();
+ getServer().await();
}
@@ -687,7 +669,7 @@
public void run() {
- if (server != null) {
+ if (getServer() != null) {
Catalina.this.stop();
}
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=915568&r1=915567&r2=915568&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Feb 23 22:52:05 2010
@@ -79,6 +79,10 @@
has the value http. Patch provided by Cyrille Le Clerc. (markt)
</fix>
<fix>
+ <bug>48678</bug>: Remove duplicate server field from
+ <code>org.apache.catalina.startup.Catalina</code>. (markt)
+ </fix>
+ <fix>
<bug>48726</bug>: Prevent OOME when uploading large WAR files with the
deployer. Patch provided by adam. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
