You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by qu...@apache.org on 2003/01/28 21:23:24 UTC

cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/intake IntakeTool.java

quintonm    2003/01/28 12:23:24

  Modified:    src/java/org/apache/turbine/services/intake Tag:
                        TURBINE_2_2_BRANCH IntakeTool.java
  Log:
  IntakeTool will now just log a warning message when there are no intake groups defined.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.1   +14 -8     jakarta-turbine-2/src/java/org/apache/turbine/services/intake/IntakeTool.java
  
  Index: IntakeTool.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/IntakeTool.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- IntakeTool.java	16 Nov 2002 16:19:34 -0000	1.7
  +++ IntakeTool.java	28 Jan 2003 20:23:24 -0000	1.7.2.1
  @@ -87,14 +87,20 @@
       public IntakeTool()
       {
           String[] groupNames = TurbineIntake.getGroupNames();
  -        groups = new HashMap((int)(1.25*groupNames.length + 1));
  -        pullMap = new HashMap((int)(1.25*groupNames.length + 1));
  -        // omToolKey = TurbineResources.getString("tool.intake.om");
  -
  -        for (int i=groupNames.length-1; i>=0; i--)
  +        if(groupNames != null)
           {
  -            pullMap.put(groupNames[i], new PullHelper(groupNames[i]));
  -        }
  +            groups = new HashMap((int)(1.25*groupNames.length + 1));
  +            pullMap = new HashMap((int)(1.25*groupNames.length + 1));
  +
  +            for (int i=groupNames.length-1; i>=0; i--)
  +            {
  +                pullMap.put(groupNames[i], new PullHelper(groupNames[i]));
  +            }
  +		}
  +		else
  +		{
  +			Log.warn("You do not have any groups defined for intake!!!!");
  +		}
       }
   
       /**
  
  
  

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


Re: cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/services/intake IntakeTool.java

Posted by Daniel Rall <dl...@collab.net>.
Does this situation really require _four_ exclamation points in the log 
message? 


On 28 Jan 2003 quintonm@apache.org wrote:

> quintonm    2003/01/28 12:23:24
> 
>   Modified:    src/java/org/apache/turbine/services/intake Tag:
>                         TURBINE_2_2_BRANCH IntakeTool.java
>   Log:
>   IntakeTool will now just log a warning message when there are no intake groups defined.
>   
>   Revision  Changes    Path
>   No                   revision
>   
>   
>   No                   revision
>   
>   
>   1.7.2.1   +14 -8     jakarta-turbine-2/src/java/org/apache/turbine/services/intake/IntakeTool.java
>   
>   Index: IntakeTool.java
>   ===================================================================
>   RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/IntakeTool.java,v
>   retrieving revision 1.7
>   retrieving revision 1.7.2.1
>   diff -u -r1.7 -r1.7.2.1
>   --- IntakeTool.java	16 Nov 2002 16:19:34 -0000	1.7
>   +++ IntakeTool.java	28 Jan 2003 20:23:24 -0000	1.7.2.1
>   @@ -87,14 +87,20 @@
>        public IntakeTool()
>        {
>            String[] groupNames = TurbineIntake.getGroupNames();
>   -        groups = new HashMap((int)(1.25*groupNames.length + 1));
>   -        pullMap = new HashMap((int)(1.25*groupNames.length + 1));
>   -        // omToolKey = TurbineResources.getString("tool.intake.om");
>   -
>   -        for (int i=groupNames.length-1; i>=0; i--)
>   +        if(groupNames != null)
>            {
>   -            pullMap.put(groupNames[i], new PullHelper(groupNames[i]));
>   -        }
>   +            groups = new HashMap((int)(1.25*groupNames.length + 1));
>   +            pullMap = new HashMap((int)(1.25*groupNames.length + 1));
>   +
>   +            for (int i=groupNames.length-1; i>=0; i--)
>   +            {
>   +                pullMap.put(groupNames[i], new PullHelper(groupNames[i]));
>   +            }
>   +		}
>   +		else
>   +		{
>   +			Log.warn("You do not have any groups defined for intake!!!!");
>   +		}
>        }
>    
>        /**
>   
>   
>   
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
> For additional commands, e-mail: turbine-dev-help@jakarta.apache.org
> 


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