mikeh 01/05/23 08:42:22
Modified: src/java/org/apache/turbine Turbine.java
Log:
cleaned up line that wrap over 80 chars
Revision Changes Path
1.58 +15 -12 jakarta-turbine/src/java/org/apache/turbine/Turbine.java
Index: Turbine.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/Turbine.java,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- Turbine.java 2001/05/16 16:44:51 1.57
+++ Turbine.java 2001/05/23 15:42:15 1.58
@@ -116,7 +116,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: Turbine.java,v 1.57 2001/05/16 16:44:51 jon Exp $
+ * @version $Id: Turbine.java,v 1.58 2001/05/23 15:42:15 mikeh Exp $
*/
public class Turbine extends HttpServlet
{
@@ -271,11 +271,12 @@
.getInstance().getInstance(TurbineResources.getString(
"action.sessionvalidator"));
- // if this is the redirected stage of the initial request, check that
- // the session is now not new. If it is not, then redirect back to the
+ // if this is the redirected stage of the initial request,
+ // check that the session is now not new.
+ // If it is not, then redirect back to the
// original URL (i.e. remove the "redirected" pathinfo)
- if (data.getParameters().getString(REDIRECTED_PATHINFO_NAME, "false")
- .equals("true"))
+ if (data.getParameters()
+ .getString(REDIRECTED_PATHINFO_NAME, "false").equals("true"))
{
if (data.getSession().isNew())
{
@@ -314,7 +315,7 @@
// "data.getResponse()" represents the HTTP servlet
// response.
if ( sessionValidator.requiresNewSession(data) &&
- data.getSession().isNew() )
+ data.getSession().isNew() )
{
DynamicURI duri = new DynamicURI (data, true);
@@ -328,16 +329,18 @@
duri.addPathInfo((String)key, (String)value );
}
- // add a dummy bit of path info to fool browser into thinking
- // this is a new URL
- if (!data.getParameters().containsKey(REDIRECTED_PATHINFO_NAME))
+ // add a dummy bit of path info to fool browser into
+ // thinking this is a new URL
+ if (!data.getParameters()
+ .containsKey(REDIRECTED_PATHINFO_NAME))
{
duri.addPathInfo(REDIRECTED_PATHINFO_NAME, "true");
}
- // as the session is new take this opportunity to set the
session
- // timeout if specified in TR.properties
- int timeout = TurbineResources.getInt("session.timeout", -1);
+ // as the session is new take this opportunity to
+ // set the session timeout if specified in TR.properties
+ int timeout =
+ TurbineResources.getInt("session.timeout", -1);
if (timeout != -1)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
