From dev-return-78604-apmail-ant-dev-archive=ant.apache.org@ant.apache.org Sun Apr 08 11:55:11 2007 Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 86048 invoked from network); 8 Apr 2007 11:55:10 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 8 Apr 2007 11:55:10 -0000 Received: (qmail 48496 invoked by uid 500); 8 Apr 2007 11:55:16 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 48188 invoked by uid 500); 8 Apr 2007 11:55:16 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 48177 invoked by uid 500); 8 Apr 2007 11:55:16 -0000 Received: (qmail 48172 invoked by uid 99); 8 Apr 2007 11:55:16 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Apr 2007 04:55:16 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 08 Apr 2007 04:55:09 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id C7B7C1A9838; Sun, 8 Apr 2007 04:54:48 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r526539 - in /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb: DDCreator.java Ejbc.java Date: Sun, 08 Apr 2007 11:54:48 -0000 To: ant-cvs@apache.org From: jkf@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070408115448.C7B7C1A9838@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jkf Date: Sun Apr 8 04:54:46 2007 New Revision: 526539 URL: http://svn.apache.org/viewvc?view=rev&rev=526539 Log: Changes after static code analysis. Code really changed. Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java?view=diff&rev=526539&r1=526538&r2=526539 ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/DDCreator.java Sun Apr 8 04:54:46 2007 @@ -68,12 +68,12 @@ if (descriptorDirectory == null || !descriptorDirectory.isDirectory()) { throw new BuildException("descriptors directory " - + descriptorDirectory.getPath() + " is not valid"); + + descriptorDirectory == null ? null : descriptorDirectory.getPath() + " is not valid"); } if (generatedFilesDirectory == null || !generatedFilesDirectory.isDirectory()) { throw new BuildException("dest directory " - + generatedFilesDirectory.getPath() + " is not valid"); + + generatedFilesDirectory == null ? null : generatedFilesDirectory.getPath() + " is not valid"); } String args = descriptorDirectory + " " + generatedFilesDirectory; Modified: ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java URL: http://svn.apache.org/viewvc/ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java?view=diff&rev=526539&r1=526538&r2=526539 ============================================================================== --- ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java (original) +++ ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/optional/ejb/Ejbc.java Sun Apr 8 04:54:46 2007 @@ -82,18 +82,18 @@ if (descriptorDirectory == null || !descriptorDirectory.isDirectory()) { throw new BuildException("descriptors directory " - + descriptorDirectory.getPath() + " is not valid"); + + descriptorDirectory == null ? null : descriptorDirectory.getPath() + " is not valid"); } if (generatedFilesDirectory == null || !generatedFilesDirectory.isDirectory()) { throw new BuildException("dest directory " - + generatedFilesDirectory.getPath() + " is not valid"); + + generatedFilesDirectory == null ? null : generatedFilesDirectory.getPath() + " is not valid"); } if (sourceDirectory == null || !sourceDirectory.isDirectory()) { throw new BuildException("src directory " - + sourceDirectory.getPath() + " is not valid"); + + sourceDirectory == null ? null : sourceDirectory.getPath() + " is not valid"); } String systemClassPath = System.getProperty("java.class.path"); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org