pbwest      2003/12/30 20:28:27

  Modified:    src/java/org/apache/fop/apps Tag: FOP_0-20-0_Alt-Design
                        Options.java
  Log:
  Make failure to find user config file non-fatal.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.3   +11 -3     xml-fop/src/java/org/apache/fop/apps/Attic/Options.java
  
  Index: Options.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Attic/Options.java,v
  retrieving revision 1.1.2.2
  retrieving revision 1.1.2.3
  diff -u -r1.1.2.2 -r1.1.2.3
  --- Options.java      11 Jul 2003 04:03:47 -0000      1.1.2.2
  +++ Options.java      31 Dec 2003 04:28:27 -0000      1.1.2.3
  @@ -458,8 +458,16 @@
                   readOk = false;
               }
               if (! readOk) {
  -                // Try reading the file using loadConfig()
  -                loadConfiguration(userConfigFileName);
  +                try {
  +                    // Try reading the file using loadConfig()
  +                    loadConfiguration(userConfigFileName);
  +                } catch (FOPException ex) {
  +                    MessageHandler.logln("Can't find user configuration file "
  +                    + userConfigFile + " in system locations");
  +                    if (debug) {
  +                        reader.dumpError(ex);
  +                    }
  +                }
               }
           }
       }
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to