cvs commit: jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb WLRun.java

[conor]

conor       01/08/15 16:16:06

  Modified:    src/main/org/apache/tools/ant/taskdefs/optional/ejb Tag:
                        ANT_14_BRANCH WLRun.java
  Log:
  Fix problem in wlrun with null proeprties files
  
  PR:   3137
  Submitted by: [EMAIL PROTECTED] (David Rees)
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.10.2.1  +3 -4      
jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java
  
  Index: WLRun.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-ant/src/main/org/apache/tools/ant/taskdefs/optional/ejb/WLRun.java,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- WLRun.java        2001/07/12 12:43:01     1.10
  +++ WLRun.java        2001/08/15 23:16:06     1.10.2.1
  @@ -263,12 +263,11 @@
   
           File propertiesFile = null;
           
  +
           if (weblogicPropertiesFile == null) {
  -            propertiesFile = new File(weblogicSystemHome, 
DEFAULT_PROPERTIES_FILE);
  +            weblogicPropertiesFile = DEFAULT_PROPERTIES_FILE;
           }
  -        else {
  -            propertiesFile = new File(weblogicSystemHome, 
weblogicPropertiesFile);
  -        }
  +        propertiesFile = new File(weblogicSystemHome, 
weblogicPropertiesFile);
           if (!propertiesFile.exists()) {
               // OK, properties file may be absolute
               propertiesFile = project.resolveFile(weblogicPropertiesFile);