cvs commit: jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly JellyContext.java

[jstrachan]

jstrachan    2002/10/10 07:50:22

  Modified:    jelly/src/java/org/apache/commons/jelly JellyContext.java
  Log:
  avoided null pointer exception if inherit is true and there is no parent
  
  Revision  Changes    Path
  1.30      +5 -4      
jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/JellyContext.java
  
  Index: JellyContext.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/JellyContext.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- JellyContext.java 3 Oct 2002 07:52:37 -0000       1.29
  +++ JellyContext.java 10 Oct 2002 14:50:21 -0000      1.30
  @@ -214,10 +214,11 @@
       public Object getVariable(String name) {
           Object value = variables.get(name);
   
  -        if ( value == null 
  -             &&
  -             isInherit() ) {
  -            value = getParent().findVariable( name );
  +        if ( value == null && isInherit() ) {
  +            JellyContext parent = getParent();
  +            if (parent != null) {                
  +                value = parent.findVariable( name );
  +            }
           }
   
           return value;
  
  
  

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