Author: gvanmatre Date: Fri Jul 27 19:30:45 2007 New Revision: 560468 URL: http://svn.apache.org/viewvc?view=rev&rev=560468 Log: Removed logic that checks the state saving method before trying to inject the hidden form state marker (SHALE-450)
Modified: shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandler.java Modified: shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandler.java URL: http://svn.apache.org/viewvc/shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandler.java?view=diff&rev=560468&r1=560467&r2=560468 ============================================================================== --- shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandler.java (original) +++ shale/framework/trunk/shale-clay/src/main/java/org/apache/shale/clay/faces/ClayViewHandler.java Fri Jul 27 19:30:45 2007 @@ -423,27 +423,22 @@ context.setResponseWriter(responsewriter); StringBuffer buff = writer.getBuffer(); - if (stateManager.isSavingStateInClient(context)) { - int curPos = 0; // current position - int fndPos = 0; //start of a marker - int frmMkrIdx = indexOfFormMarker(); + int curPos = 0; // current position + int fndPos = 0; //start of a marker + int frmMkrIdx = indexOfFormMarker(); - //might be multiple forms in the document - do { - fndPos = buff.indexOf(FORM_MARKERS[frmMkrIdx], curPos); - if (fndPos > -1) { - responsewriter.write(buff.substring(curPos, fndPos)); - stateManager.writeState(context, serializedview); - curPos = fndPos + FORM_MARKERS[frmMkrIdx].length(); - } else { - responsewriter.write(buff.substring(curPos)); - } - } while(curPos < buff.length() && fndPos > -1); + //might be multiple forms in the document + do { + fndPos = buff.indexOf(FORM_MARKERS[frmMkrIdx], curPos); + if (fndPos > -1) { + responsewriter.write(buff.substring(curPos, fndPos)); + stateManager.writeState(context, serializedview); + curPos = fndPos + FORM_MARKERS[frmMkrIdx].length(); + } else { + responsewriter.write(buff.substring(curPos)); + } + } while(curPos < buff.length() && fndPos > -1); - } else { - //using server side state no need to look for form markers - responsewriter.write(buff.toString()); - } } else { //dispatch (forward) to the jsp