webwork/src/main/webwork/dispatcher GenericDispatcher.java,1.20,1.21

Update of /cvsroot/opensymphony/webwork/src/main/webwork/dispatcher
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30612/src/main/webwork/dispatcher

Modified Files:
	GenericDispatcher.java 
Log Message:
We don't care about the old context if it's null (eg, someone has nulled it explicitly)

Index: GenericDispatcher.java
===================================================================
RCS file: /cvsroot/opensymphony/webwork/src/main/webwork/dispatcher/GenericDispatcher.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- GenericDispatcher.java	9 Jul 2005 19:21:56 -0000	1.20
+++ GenericDispatcher.java	9 Jul 2005 21:43:57 -0000	1.21
@@ -79,7 +79,8 @@
    public ActionContext prepareContext()
    {
       // Get oldContext and save
-      oldContextTable = ActionContext.getContext().getTable();
+     if(ActionContext.getContext() != null)
+        oldContextTable = ActionContext.getContext().getTable();
       // Create new context
       context = new ActionContext();
       ActionContext.setContext(context);



-------------------------------------------------------
This SF.Net email is sponsored by the 'Do More With Dual!' webinar happening
July 14 at 8am PDT/11am EDT. We invite you to explore the latest in dual
core and dual graphics technology at this free one hour event hosted by HP, 
AMD, and NVIDIA.  To register visit http://www.hp.com/go/dualwebinar