portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed/src/java/org/apache/jetspeed/util/template JetspeedTool.java
Date Wed, 25 Apr 2001 00:07:56 GMT
taylor      01/04/24 17:07:56

  Modified:    src/java/org/apache/jetspeed/util/template JetspeedTool.java
  Log:
  ProfileException must be caught
  
  Revision  Changes    Path
  1.4       +12 -3     jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedTool.java
  
  Index: JetspeedTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/JetspeedTool.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- JetspeedTool.java	2001/04/03 00:27:35	1.3
  +++ JetspeedTool.java	2001/04/25 00:07:56	1.4
  @@ -55,6 +55,7 @@
   package org.apache.jetspeed.util.template;
   
   import org.apache.ecs.ConcreteElement;
  +import org.apache.ecs.StringElement;
   import org.apache.turbine.util.RunData;
   import org.apache.turbine.util.Log;
   import org.apache.turbine.services.pull.ApplicationTool;
  @@ -74,7 +75,7 @@
    * shared between threads and/or requests</strong>
    *
    * @author <a href="mailto:raphael@apache.org">RaphaŽl Luta</a>
  - * @version $Id: JetspeedTool.java,v 1.3 2001/04/03 00:27:35 raphael Exp $
  + * @version $Id: JetspeedTool.java,v 1.4 2001/04/25 00:07:56 taylor Exp $
    */
   public class JetspeedTool implements ApplicationTool
   {
  @@ -134,8 +135,16 @@
           if ((name == null) || "default".equals(name) || "".equals(name))
           {
               CapabilityMap cm = CapabilityMapFactory.getCapabilityMap(rundata);
  -            Profile profile = ProfileManager.getProfile(rundata,cm);
  -            result = profile.getRootSet(rundata).getContent(rundata);
  +            try
  +            {
  +                Profile profile = ProfileManager.getProfile(rundata,cm);
  +                result = profile.getRootSet(rundata).getContent(rundata);
  +            }
  +            catch (ProfileException e)
  +            {
  +                Log.error(e);
  +                return new StringElement( e.toString() );
  +            }
           } 
           else
           {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message