cvs commit: xml-xalan/c/src/XSLT ElemTemplateElement.cpp

[jdonohue]

jdonohue    00/04/20 11:22:51

  Modified:    c/src/XSLT ElemTemplateElement.cpp
  Log:
  Check for null result
  
  Revision  Changes    Path
  1.16      +14 -10    xml-xalan/c/src/XSLT/ElemTemplateElement.cpp
  
  Index: ElemTemplateElement.cpp
  ===================================================================
  RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplateElement.cpp,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ElemTemplateElement.cpp   2000/04/20 16:47:34     1.15
  +++ ElemTemplateElement.cpp   2000/04/20 18:22:51     1.16
  @@ -688,17 +688,21 @@
                        xslInstruction,
                        executionContext);
   
  -             sourceNodes = result->mutableNodeset();
  -     
  -             if(0 != getStylesheet().getStylesheetRoot().getTraceListeners())
  +             // @@ JMD: Should this be an assert ??
  +             if (0 != result)
                {
  -                     getStylesheet().getStylesheetRoot().fireSelectedEvent(
  -                             SelectionEvent(executionContext, 
  -                                     sourceNodeContext,
  -                                     *this,
  -                                     XALAN_STATIC_UCODE_STRING("select"),
  -                                     *selectPattern,
  -                                     result));
  +                     sourceNodes = result->mutableNodeset();
  +
  +                     if(0 != 
getStylesheet().getStylesheetRoot().getTraceListeners())
  +                     {
  +                             
getStylesheet().getStylesheetRoot().fireSelectedEvent(
  +                                             
SelectionEvent(executionContext, 
  +                                                     sourceNodeContext,
  +                                                     *this,
  +                                                     
XALAN_STATIC_UCODE_STRING("select"),
  +                                                     *selectPattern,
  +                                                     result));
  +                     }
                }
                
executionContext.setCurrentStackFrameIndex(savedCurrentStackFrameIndex);
        }