brekke      02/02/08 13:36:29

  Modified:    src/java/org/apache/turbine Turbine.java
  Log:
  Minor compile changes to init the string before usage and use
  StringUtils.makeString() to ensure a string is printed in the exception
  message.  Fixed error in Log method being used.
  
  Revision  Changes    Path
  1.10      +4 -4      jakarta-turbine-2/src/java/org/apache/turbine/Turbine.java
  
  Index: Turbine.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/Turbine.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Turbine.java      8 Feb 2002 15:06:45 -0000       1.9
  +++ Turbine.java      8 Feb 2002 21:36:29 -0000       1.10
  @@ -116,7 +116,7 @@
    * @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
    * @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
  - * @version $Id: Turbine.java,v 1.9 2002/02/08 15:06:45 mpoeschl Exp $
  + * @version $Id: Turbine.java,v 1.10 2002/02/08 21:36:29 brekke Exp $
    */
   public class Turbine
       extends HttpServlet
  @@ -832,7 +832,7 @@
       private void loadSubsystems()
       {
           // name of the subsystem
  -        String sysName;
  +        String sysName = null;
           // name of the class to load
           String sysClassName;
           // name of the config file used to configure the subsystem
  @@ -852,7 +852,7 @@
                           TurbineResources.getString("subsystem."+ sysName
                           + ".config"));
   
  -                Log.notice("loading subsystem " + sysName + " - class: "
  +                Log.note("loading subsystem " + sysName + " - class: "
                           + sysClassName + " with config: " + sysConfig);
   
                   Object sys = Class.forName(sysClassName).newInstance();
  @@ -866,7 +866,7 @@
               }
               catch (Exception ex)
               {
  -                Log.error(sysName + " could not be initialized!", ex);
  +                Log.error(StringUtils.makeString(sysName) + " could not be 
initialized!", ex);
               }
           }
       }
  
  
  

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

Reply via email to