From scm-return-5042-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Mon Sep 13 18:02:43 2004 Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 24398 invoked from network); 13 Sep 2004 18:02:43 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 13 Sep 2004 18:02:43 -0000 Received: (qmail 2854 invoked by uid 500); 13 Sep 2004 18:02:43 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 2682 invoked by uid 500); 13 Sep 2004 18:02:42 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: list-post: Reply-To: dev@geronimo.apache.org Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 2666 invoked by uid 99); 13 Sep 2004 18:02:41 -0000 X-ASF-Spam-Status: No, hits=-2.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Mon, 13 Sep 2004 11:02:40 -0700 Received: (qmail 24358 invoked by uid 65534); 13 Sep 2004 18:02:39 -0000 Date: 13 Sep 2004 18:02:39 -0000 Message-ID: <20040913180239.24355.qmail@minotaur.apache.org> From: dain@apache.org To: scm@geronimo.apache.org Subject: svn commit: rev 45995 - geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: dain Date: Mon Sep 13 11:02:39 2004 New Revision: 45995 Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/ToolsJarHack.java Log: http://nagoya.apache.org/jira/browse/GERONIMO-294 The log message was causing a null pointer exception. Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/ToolsJarHack.java ============================================================================== --- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/ToolsJarHack.java (original) +++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/ToolsJarHack.java Mon Sep 13 11:02:39 2004 @@ -29,7 +29,7 @@ import sun.misc.URLClassPath; /** - * @version $Revision: 1.2 $ $Date: 2004/09/09 03:15:04 $ + * @version $Revision: 1.2 $ $Date$ */ public class ToolsJarHack { private static boolean installed = false; @@ -94,8 +94,8 @@ return toolsJarFile; } - log.warn("Could not all find java compiler: tools.jar file not found at " + toolsJarFile.getAbsolutePath() + - " or " + toolsJarFile.getParentFile().getAbsolutePath()); + log.warn("Could not all find java compiler: lib" + File.separator + "tools.jar file not found in " + + javaHomeDir.getAbsolutePath() + " or " + javaHomeDir.getParentFile().getAbsolutePath()); return null; } @@ -103,11 +103,9 @@ File toolsJarFile; toolsJarFile = new File(javaHomeDir, "lib" + File.separator + "tools.jar"); if (!toolsJarFile.exists()) { - log.warn("Could not all find java compiler: tools.jar file not found at " + toolsJarFile.getAbsolutePath()); return null; } if (!toolsJarFile.isFile()) { - log.warn("Could not all find java compiler: tools.jar file not a regular file: " + toolsJarFile.getAbsolutePath()); return null; } return toolsJarFile;