Attachment 23940 Details for Bug 47495 – tc_bug_47495_patch.txt

tc_bug_47495_patch.txt

tc_bug_47495_patch.txt (text/plain), 1.49 KB, created by Ralf Hauser on 2009-07-08 02:30:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Hauser

Created: 2009-07-08 02:30:33 UTC

Size: 1.49 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P tomcat6.0.x-trunk
>Index: java/org/apache/catalina/startup/Catalina.java
>===================================================================
>--- java/org/apache/catalina/startup/Catalina.java	(revision 791797)
>+++ java/org/apache/catalina/startup/Catalina.java	(working copy)
>@@ -512,6 +512,10 @@
> 
>         if ((inputStream == null) && (file != null)) {
>             log.warn("Can't load server.xml from " + file.getAbsolutePath());
>+            //also to stderr since e.g. in the eclipse sysdeo tomcat plugin setup, the log is not visible in eclipse's console window
>+            System.err.println("Can't load server.xml from " + file.getAbsolutePath() +
>+            		" - possibly server.xml not readable for user "+System.getProperty("user.name"));
>+            //TODO inform also about owner/group and permissions (yes, this is native, but perhaps for linux and windows, this would be helpful..)
>             return;
>         }
> 
>@@ -643,9 +647,13 @@
>      * Await and shutdown.
>      */
>     public void await() {
>-
>-        server.await();
>-
>+        if (null == server) {
>+            log.error("null == server", new Exception());
>+            //also to stderr since e.g. in the eclipse sysdeo tomcat plugin setup, the log is not visible in eclipse's console window
>+            System.err.println("null == server - possibly server.xml not readable for user "+System.getProperty("user.name"));
>+        } else {
>+            server.await();
>+        }
>     }
> 
>

Actions: View

Attachments on bug 47495: 23940