[cvs] expresso commit by rauld: Corrected potential NPE in newState()

[JCorporate Ltd]

Log Message:
-----------
Corrected potential NPE in newState()

Modified Files:
--------------
    expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller:
        Controller.java

Revision Data
-------------
Index: Controller.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java,v
retrieving revision 1.110
retrieving revision 1.111
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java -u -r1.110 -r1.111
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java
@@ -936,7 +936,7 @@
 
     /**
      * recreate requested URL; never null, though could be empty string
-     * 
+     *
      * @param req the servlet request
      * @return String the request URL
      */
@@ -1313,6 +1313,12 @@
             nextState.perform(stateForm, myRequest, myResponse);
 
             cr = nextState.getResponse();
+
+            //In case an external state does not call setResponse()
+            if(cr == null){
+              cr = myResponse;
+            }
+
         }
 
         //Move the state form back into the controller form