[WebMacro-cvs] webmacro/src/org/webmacro/servlet WMServlet.java,1.56,1.57

[<wan...@us...>]

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv5471

Modified Files:
	WMServlet.java 
Log Message:
Removed redundant FastWriter code in execute() method - was causing NPEs under some conditions due to closing null FW.

Index: WMServlet.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/WMServlet.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** WMServlet.java	8 Jul 2003 19:48:45 -0000	1.56
--- WMServlet.java	11 Jul 2003 12:25:43 -0000	1.57
***************
*** 550,554 ****
              throws IOException
      {
-         FastWriter fw = null;
          boolean timing = Flags.PROFILE && c.isTiming();
          try
--- 550,553 ----
***************
*** 591,604 ****
                  if (timing) c.stopTiming();
              }
-             if (timing) c.startTiming("FastWriter.close()");
-             try
-             {
-                 fw.close();
-                 fw = null;
-             }
-             finally
-             {
-                 if (timing) c.stopTiming();
-             }
          }
          catch (UnsupportedEncodingException e)
--- 590,593 ----
***************
*** 639,658 ****
              }
          }
-         finally
-         {
-             try
-             {
-                 if (fw != null)
-                 {
-                     fw.flush();
-                     fw.close();
-                     fw = null;
-                 }
-             }
-             catch (Exception e3)
-             {
-                 // ignore disconnect
-             }
-         }
      }
  
--- 628,631 ----
***************
*** 722,726 ****
       * should analyze the data in the request, put whatever values are
       * required into the context, and return the appropriate view.
-      * @see getTemplate
       * @return the template to be rendered by the WebMacro engine
       * @exception HandlerException throw this to produce vanilla error messages
--- 695,698 ----