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 2013/01/29 21:18:00 UTC

svn commit: r1440096 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml

Author: markt
Date: Tue Jan 29 20:17:59 2013
New Revision: 1440096

URL: http://svn.apache.org/viewvc?rev=1440096&view=rev
Log:
Include the exception in the error message

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:r1440095

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=1440096&r1=1440095&r2=1440096&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 Tue Jan 29 20:17:59 2013
@@ -612,7 +612,7 @@ public class HostConfig
                 } catch (Exception e) {
                     log.error(sm.getString(
                             "hostConfig.deployDescriptor.error",
-                            contextXml.getAbsolutePath()));
+                            contextXml.getAbsolutePath()), 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=1440096&r1=1440095&r2=1440096&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Tue Jan 29 20:17:59 2013
@@ -90,6 +90,10 @@
         In this case, because most sessions is not time-out, SSO deregister was
         triggered. (kfujino)
       </fix>
+      <fix>
+        Include the exception in the log message if the parsing of the
+        context.xml file fails. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Coyote">



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Re: svn commit: r1440096 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/startup/HostConfig.java webapps/docs/changelog.xml

Posted by Konstantin Kolinko <kn...@gmail.com>.
2013/1/30  <ma...@apache.org>:
> Author: markt
> Date: Tue Jan 29 20:17:59 2013
> New Revision: 1440096
>
> URL: http://svn.apache.org/viewvc?rev=1440096&view=rev
> Log:
> Include the exception in the error message
>
> 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:r1440095
>

>                  } catch (Exception e) {
>                      log.error(sm.getString(
>                              "hostConfig.deployDescriptor.error",
> -                            contextXml.getAbsolutePath()));
> +                            contextXml.getAbsolutePath()), e);
>                      context = new FailedContext();
>                  } finally {
>                      digester.reset();

"digester.parse(" is called in 4 places in HostConfig.java.
The other 3 need the same fix.

Best regards,
Konstantin Kolinko

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org