You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by gs...@apache.org on 2007/10/11 23:07:42 UTC

svn commit: r583954 - /wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java

Author: gseitz
Date: Thu Oct 11 14:07:42 2007
New Revision: 583954

URL: http://svn.apache.org/viewvc?rev=583954&view=rev
Log:
reformatted with correct wicket formatting settings

Modified:
    wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java

Modified: wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java
URL: http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java?rev=583954&r1=583953&r2=583954&view=diff
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java (original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/protocol/http/WebSession.java Thu Oct 11 14:07:42 2007
@@ -62,8 +62,7 @@
 	};
 
 	/**
-	 * Constructor. Note that {@link RequestCycle} is not available until this
-	 * constructor returns.
+	 * Constructor. Note that {@link RequestCycle} is not available until this constructor returns.
 	 * 
 	 * @deprecated Use #WebSession(Request) instead
 	 * 
@@ -78,8 +77,7 @@
 	}
 
 	/**
-	 * Constructor. Note that {@link RequestCycle} is not available until this
-	 * constructor returns.
+	 * Constructor. Note that {@link RequestCycle} is not available until this constructor returns.
 	 * 
 	 * @deprecated Use #WebSession(Request)
 	 * 
@@ -94,8 +92,7 @@
 	}
 
 	/**
-	 * Constructor. Note that {@link RequestCycle} is not available until this
-	 * constructor returns.
+	 * Constructor. Note that {@link RequestCycle} is not available until this constructor returns.
 	 * 
 	 * @param request
 	 *            The current request
@@ -154,9 +151,9 @@
 		// without further delay) or in case the redirect to render strategy is
 		// used, when we're doing the render request (isRedirect should return
 		// false in that case)
-		if (Application.get().getRequestCycleSettings().getRenderStrategy() != IRequestCycleSettings.REDIRECT_TO_RENDER
-				|| ((WebRequest)RequestCycle.get().getRequest()).isAjax()
-				|| (!RequestCycle.get().isRedirect()))
+		if (Application.get().getRequestCycleSettings().getRenderStrategy() != IRequestCycleSettings.REDIRECT_TO_RENDER ||
+				((WebRequest)RequestCycle.get().getRequest()).isAjax() ||
+				(!RequestCycle.get().isRedirect()))
 		{
 			// If session scoped, rendered messages got indeed cleaned up, mark
 			// the session as dirty