Hello community, here is the log from the commit of package tomcat6 for openSUSE:Factory checked in at Sat Oct 3 01:31:59 CEST 2009. -------- --- tomcat6/tomcat6.changes 2009-08-26 15:03:30.000000000 +0200 +++ tomcat6/tomcat6.changes 2009-09-30 10:06:29.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Sep 30 08:01:35 UTC 2009 - mvyskocil@suse.cz + +- fixed bnc#542634: Tomcat NPE on start + applied patch from upstream bugzilla + https://issues.apache.org/bugzilla/show_bug.cgi?id=47316#c3 + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- tomcat6-bug47316.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libtcnative-1-0.spec ++++++ --- /var/tmp/diff_new_pack.fSueBF/_old 2009-10-03 01:18:26.000000000 +0200 +++ /var/tmp/diff_new_pack.fSueBF/_new 2009-10-03 01:18:26.000000000 +0200 @@ -29,7 +29,7 @@ Name: libtcnative-1-0 Version: %{major}.%{minor}.%{micro} -Release: 1 +Release: 2 Summary: JNI wrappers for Apache Portable Runtime for Tomcat Group: Productivity/Networking/Web/Servers License: Apache Software License .. ++++++ tomcat6.spec ++++++ --- /var/tmp/diff_new_pack.fSueBF/_old 2009-10-03 01:18:26.000000000 +0200 +++ /var/tmp/diff_new_pack.fSueBF/_new 2009-10-03 01:18:26.000000000 +0200 @@ -36,7 +36,7 @@ Name: tomcat6 Version: %{major_version}.%{minor_version}.%{macro_version} -Release: 1 +Release: 2 Summary: Apache Servlet/JSP Engine, RI for Servlet 2.5/JSP 2.1 API Group: Productivity/Networking/Web/Servers License: Apache Software License .. @@ -48,6 +48,8 @@ #Source3: %{name}-%{major_version}.%{minor_version}.sysconfig Source4: %{name}-%{major_version}.%{minor_version}.wrapper Patch0: %{name}-%{major_version}.%{minor_version}.bootstrap-MANIFEST.MF.patch +#PATCH-FIX-UPSTREAM: bao#47316, bnc#542634 +Patch1: tomcat6-bug47316.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: ant @@ -180,6 +182,7 @@ %{__rm} -rf ${RPM_BUILD_DIR}/%{name}-%{version} %setup -q -c -T -a 0 %patch0 -p1 +%patch1 -b .bug47316 %build pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname} ++++++ tomcat6-bug47316.patch ++++++ Index: apache-tomcat-6.0.20-src/java/org/apache/catalina/connector/Connector.java =================================================================== --- apache-tomcat-6.0.20-src/java/org/apache/catalina/connector/Connector.java.orig 2009-05-14 01:15:15.000000000 +0200 +++ apache-tomcat-6.0.20-src/java/org/apache/catalina/connector/Connector.java 2009-09-30 09:38:48.877844567 +0200 @@ -263,7 +263,7 @@ /** * Mapper listener. */ - protected MapperListener mapperListener = new MapperListener(mapper); + protected MapperListener mapperListener = new MapperListener(mapper, this); /** Index: apache-tomcat-6.0.20-src/java/org/apache/catalina/connector/MapperListener.java =================================================================== --- apache-tomcat-6.0.20-src/java/org/apache/catalina/connector/MapperListener.java.orig 2009-05-14 01:15:15.000000000 +0200 +++ apache-tomcat-6.0.20-src/java/org/apache/catalina/connector/MapperListener.java 2009-09-30 09:48:47.837416209 +0200 @@ -29,7 +29,6 @@ import org.apache.catalina.ContainerEvent; import org.apache.catalina.ContainerListener; import org.apache.catalina.Host; -import org.apache.catalina.ServerFactory; import org.apache.catalina.core.StandardContext; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; @@ -62,6 +61,11 @@ * Associated mapper. */ protected Mapper mapper = null; + + /** + * Associated connector. + */ + protected Connector connector = null; /** * MBean server. @@ -85,8 +89,9 @@ /** * Create mapper listener. */ - public MapperListener(Mapper mapper) { + public MapperListener(Mapper mapper, Connector connector) { this.mapper = mapper; + this.connector = connector; } @@ -329,9 +334,9 @@ String name=objectName.getKeyProperty("host"); if( name != null ) { - Host host = (Host) ServerFactory.getServer().findService( - domain).getContainer().findChild(name); - + Host host = + (Host) connector.getService().getContainer().findChild(name); + String[] aliases = host.findAliases(); mapper.addHost(name, aliases, objectName); host.addContainerListener(this); @@ -349,11 +354,13 @@ throws Exception { String name=objectName.getKeyProperty("host"); if( name != null ) { - Host host = (Host) ServerFactory.getServer().findService( - domain).getContainer().findChild(name); + Host host = + (Host) connector.getService().getContainer().findChild(name); mapper.removeHost(name); - host.removeContainerListener(this); + if (host != null) { + host.removeContainerListener(this); + } if(log.isDebugEnabled()) log.debug(sm.getString ("mapperListener.unregisterHost", name, domain)); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org