Author: ehillenius
Date: Sun Jul 29 11:41:16 2007
New Revision: 560781
URL: http://svn.apache.org/viewvc?view=rev&rev=560781
Log:
Session#bind: added JavaDoc and removed warning we don't need
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Session.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Session.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Session.java?view=diff&rev=560781&r1=560780&r2=560781
==============================================================================
--- wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Session.java
(original)
+++ wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/Session.java
Sun Jul 29 11:41:16 2007
@@ -115,7 +115,7 @@
*/
public abstract class Session implements IClusterable
{
- /**
+ /**
* Visitor interface for visiting page maps
*
* @author Jonathan Locke
@@ -363,28 +363,28 @@
/** A linked list for last used pagemap queue */
private final LinkedList/* <IPageMap> */usedPageMaps = new LinkedList();
- /**
+ /**
* Constructor. Note that [EMAIL PROTECTED] RequestCycle} is not
available until this
* constructor returns.
- *
+ *
* @param request
* The current request
*/
- public Session(Request request)
- {
- this.locale = request.getLocale();
- if (locale == null)
- {
- throw new IllegalArgumentException("Parameter 'locale' must not be
null");
- }
- }
+ public Session(Request request)
+ {
+ this.locale = request.getLocale();
+ if (locale == null)
+ {
+ throw new IllegalArgumentException("Parameter 'locale'
must not be null");
+ }
+ }
- /**
+ /**
* Constructor. Note that [EMAIL PROTECTED] RequestCycle} is not
available until this
* constructor returns.
*
- * @deprecated Use #Session(Request)
- *
+ * @deprecated Use #Session(Request)
+ *
* @param application
* The application that this is a session of
* @param request
@@ -392,8 +392,8 @@
*/
protected Session(Application application, Request request)
{
- this(request);
- }
+ this(request);
+ }
/**
* Force binding this session to the application's
@@ -410,6 +410,8 @@
* By calling this method, the session will be bound (made
not-temporary) if
* it was not bound yet. It is useful for cases where you want to be
* absolutely sure this session object will be available in next
requests.
+ * If the session was already bound ([EMAIL PROTECTED]
ISessionStore#lookup(Request) returns a session}),
+ * this call will be a noop.
* </p>
*/
public final void bind()
@@ -432,10 +434,6 @@
}
temporarySessionAttributes = null;
}
- }
- else
- {
- log.warn("trying to bind an already bound and
non-temporary session");
}
}