You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2010/06/29 13:39:56 UTC
svn commit: r958935 - in /tomcat/tc6.0.x/trunk: STATUS.txt
java/org/apache/catalina/core/StandardEngine.java webapps/docs/changelog.xml
Author: markt
Date: Tue Jun 29 11:39:56 2010
New Revision: 958935
URL: http://svn.apache.org/viewvc?rev=958935&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49351
Avoid possible NPE when embedding
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=958935&r1=958934&r2=958935&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun 29 11:39:56 2010
@@ -143,12 +143,6 @@ PATCHES PROPOSED TO BACKPORT:
+1: markt
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49351
- Avoid possible NPE when embedding
- https://issues.apache.org/bugzilla/show_bug.cgi?id=49351#c1
- +1: markt, kkolinko, rjung
- -1:
-
* Add support for *.jar pattern in VirtualWebappLoader
and perform trimming of the tokens.
I propose the following patch, but without removing the "not for production"
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=958935&r1=958934&r2=958935&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardEngine.java Tue Jun 29 11:39:56 2010
@@ -354,6 +354,8 @@ public class StandardEngine
service=new StandardService();
service.setContainer( this );
service.initialize();
+ // Use same name for Service
+ service.setName(getName());
} catch( Throwable t ) {
log.error(t);
}
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=958935&r1=958934&r2=958935&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Tue Jun 29 11:39:56 2010
@@ -49,6 +49,10 @@
(markt)
</fix>
<fix>
+ <bug>49351</bug>: Fix possible NPe when embedding and no name is
+ specified for the Service. (markt)
+ </fix>
+ <fix>
<bug>49424</bug>: Avoid NPE if client provides no data with a chunked
POST request. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org