Author: kkolinko
Date: Fri Feb 1 08:47:40 2013
New Revision: 1441344
URL: http://svn.apache.org/viewvc?rev=1441344&view=rev
Log:
Merged revision 1441342 from tomcat/trunk:
Review of r1440096 (r1440095)
Include the exception in the error message if the parsing fails.
digester.parse() is called several times in HostConfig.java, so I am fixing the
rest of those calls.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1441342
Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1441344&r1=1441343&r2=1441344&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/startup/HostConfig.java Fri
Feb 1 08:47:40 2013
@@ -906,7 +906,7 @@ public class HostConfig
} catch (Exception e) {
log.error(sm.getString(
"hostConfig.deployDescriptor.error",
- war.getAbsolutePath()));
+ war.getAbsolutePath()), e);
context = new FailedContext();
} finally {
digester.reset();
@@ -924,7 +924,7 @@ public class HostConfig
} catch (Exception e) {
log.error(sm.getString(
"hostConfig.deployDescriptor.error",
- war.getAbsolutePath()));
+ war.getAbsolutePath()), e);
} finally {
if (context == null) {
context = new FailedContext();
@@ -1067,7 +1067,7 @@ public class HostConfig
} catch (Exception e) {
log.error(sm.getString(
"hostConfig.deployDescriptor.error",
- xml));
+ xml), e);
context = new FailedContext();
} finally {
digester.reset();
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1441344&r1=1441343&r2=1441344&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Feb 1 08:47:40 2013
@@ -92,7 +92,7 @@
</fix>
<fix>
Include the exception in the log message if the parsing of the
- context.xml file fails. (markt)
+ context.xml file fails. (markt/kkolinko)
</fix>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
