cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaSession.java

2005-09-14 Thread pero
pero2005/09/14 08:28:14

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaSession.java
  Log:
  fix: attribute and notes sync at DeltaSession,recycle()
  
  Revision  ChangesPath
  1.37  +7 -3  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
  
  Index: DeltaSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- DeltaSession.java 14 Sep 2005 12:46:56 -  1.36
  +++ DeltaSession.java 14 Sep 2005 15:28:13 -  1.37
  @@ -789,7 +789,9 @@
   public void recycle() {
   
   // Reset the instance variables associated with this Session
  -attributes.clear();
  +synchronized (attributes) {
  +attributes.clear();
  +}
   setAuthType(null);
   creationTime = 0L;
   expiring = false;
  @@ -797,7 +799,9 @@
   lastAccessedTime = 0L;
   maxInactiveInterval = -1;
   accessCount = 0;
  -notes.clear();
  +synchronized (notes) {
  +notes.clear();
  +}
   setPrincipal(null);
   isNew = false;
   isValid = false;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaSession.java

2005-09-14 Thread pero
pero2005/09/14 05:46:56

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaSession.java
  Log:
  Fix mutli threading issue at session write attributes
  S. Bug: 36541
  
  Revision  ChangesPath
  1.36  +12 -6 
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
  
  Index: DeltaSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- DeltaSession.java 26 Jun 2005 21:21:49 -  1.35
  +++ DeltaSession.java 14 Sep 2005 12:46:56 -  1.36
  @@ -1003,9 +1003,10 @@
   .getString("standardSession.getAttributeNames.ise"));
   
   synchronized (attributes) {
  -return (new Enumerator(attributes.keySet(), true));
  +// create a copy from orginal attribute keySet, otherwise 
internal HaspMap datastructure
  +// can be inconsistence by other threads.
  +return (new Enumerator(new ArrayList(attributes.keySet()), 
true));
   }
  -
   }
   
   /**
  @@ -1253,8 +1254,10 @@
   }
   
   // Replace or add this attribute
  -Object unbound = attributes.put(name, value);
  -
  +Object unbound = null ;
  +synchronized (attributes) {
  +unbound = attributes.put(name, value);
  +}
   // Call the valueUnbound() method if necessary
   if ((unbound != null) && notify
   && (unbound instanceof HttpSessionBindingListener)) {
  @@ -1577,7 +1580,10 @@
   boolean addDeltaRequest) {
   
   // Remove this attribute from our collection
  -Object value = attributes.remove(name);
  +Object value = null;
  +synchronized (attributes) {
  +value = attributes.remove(name);
  +}
   if (value == null)
   return;
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaSession.java LocalStrings.properties

2005-04-03 Thread pero
pero2005/04/03 06:26:46

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaSession.java LocalStrings.properties
  Log:
  Change to new getInternalID usage. (expire)
  
  Revision  ChangesPath
  1.33  +2 -2  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
  
  Index: DeltaSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- DeltaSession.java 3 Apr 2005 08:12:03 -   1.32
  +++ DeltaSession.java 3 Apr 2005 13:26:46 -   1.33
  @@ -674,7 +674,7 @@
   // Mark this session as "being expired" if needed
   if (expiring)
   return;
  -String expiredId = getId();
  +String expiredId = getIdInternal();
   
   synchronized (this) {
   
  
  
  
  1.5   +3 -0  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- LocalStrings.properties   3 Apr 2005 08:12:03 -   1.4
  +++ LocalStrings.properties   3 Apr 2005 13:26:46 -   1.5
  @@ -44,6 +44,7 @@
   jvmRoute.changeSession=Changed session from [{0}] to [{1}]
   jvmRoute.clusterListener.started=Cluster JvmRouteSessionIDBinderListener 
started
   jvmRoute.clusterListener.stopped=Cluster JvmRouteSessionIDBinderListener 
stoppedjvmRoute.listener.started=SessionID Binder Listener started
  +jvmRoute.configure.warn=Please, setup your JvmRouteBinderValve at host 
valve, not at context valve!
   jvmRoute.contextNotFound=Context [{0}] not found at note [{1}]!
   jvmRoute.failover=Detected a failover with different jvmRoute - orginal 
route: [{0}] new one: [{1}] at session id [{2}]
   jvmRoute.foundManager=Found Cluster DeltaManager {0} at {1}
  @@ -62,4 +63,6 @@
   jvmRoute.valve.notStarted=jvmRoute backup sessionID correction run already
   jvmRoute.valve.started=JvmRouteBinderValve started
   jvmRoute.valve.stopped=JvmRouteBinderValve stopped
  +jvmRoute.set.orignalsessionid=Set Orginal Session id at request attriute {0} 
value: {1}
   standardSession.getId.ise=getId: Session already invalidated
  +standardSession.attributeEvent=Session attribute event listener threw 
exception
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaSession.java LocalStrings.properties

2005-04-03 Thread pero
pero2005/04/03 00:12:03

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaSession.java LocalStrings.properties
  Log:
  Change to new getInternalID usage.
  
  Revision  ChangesPath
  1.32  +3 -3  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
  
  Index: DeltaSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- DeltaSession.java 31 Mar 2005 10:31:54 -  1.31
  +++ DeltaSession.java 3 Apr 2005 08:12:03 -   1.32
  @@ -898,10 +898,10 @@
   
   public void resetDeltaRequest() {
   if (deltaRequest == null) {
  -deltaRequest = new DeltaRequest(getId(), false);
  +deltaRequest = new DeltaRequest(getIdInternal(), false);
   } else {
   deltaRequest.reset();
  -deltaRequest.setSessionId(getId());
  +deltaRequest.setSessionId(getIdInternal());
   }
   }
   
  
  
  
  1.4   +1 -0  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/LocalStrings.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- LocalStrings.properties   14 Mar 2005 21:22:16 -  1.3
  +++ LocalStrings.properties   3 Apr 2005 08:12:03 -   1.4
  @@ -62,3 +62,4 @@
   jvmRoute.valve.notStarted=jvmRoute backup sessionID correction run already
   jvmRoute.valve.started=JvmRouteBinderValve started
   jvmRoute.valve.stopped=JvmRouteBinderValve stopped
  +standardSession.getId.ise=getId: Session already invalidated
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaSession.java SimpleTcpReplicationManager.java

2004-06-02 Thread fhanik
fhanik  2004/06/02 07:10:01

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaSession.java SimpleTcpReplicationManager.java
  Log:
  Fixed the session facade for events
  Fixed the deserialization to only add the session to the manager once
  
  Revision  ChangesPath
  1.24  +6 -6  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
  
  Index: DeltaSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- DeltaSession.java 26 May 2004 16:37:47 -  1.23
  +++ DeltaSession.java 2 Jun 2004 14:10:01 -   1.24
  @@ -1279,7 +1279,7 @@
   
   // Call the valueBound() method if necessary
   if ( value instanceof HttpSessionBindingListener ) {
  -event = new HttpSessionBindingEvent(this, name, value);
  +event = new HttpSessionBindingEvent(getSession(), name, value);
   try {
   ( (HttpSessionBindingListener) value).valueBound(event);
   } catch ( Exception x ) {
  @@ -1295,7 +1295,7 @@
   (unbound instanceof HttpSessionBindingListener)) {
   try {
   ( (HttpSessionBindingListener) unbound).valueUnbound
  -(new HttpSessionBindingEvent( (HttpSession)this, name));
  +(new HttpSessionBindingEvent( (HttpSession)getSession(), name));
   } catch ( Exception x ) {
   log.error("Session binding listener throw an exception",x);
   }
  @@ -1322,7 +1322,7 @@
  listener);
   if (event == null) {
   event = new HttpSessionBindingEvent
  -(this, name, unbound);
  +(getSession(), name, unbound);
   }
   listener.attributeReplaced(event);
   fireContainerEvent(context,
  @@ -1334,7 +1334,7 @@
  listener);
   if (event == null) {
   event = new HttpSessionBindingEvent
  -(this, name, unbound);
  +(getSession(), name, unbound);
   }
   listener.attributeAdded(event);
   fireContainerEvent(context,
  @@ -1614,7 +1614,7 @@
   
   // Call the valueUnbound() method if necessary
   HttpSessionBindingEvent event =
  -  new HttpSessionBindingEvent((HttpSession) this, name, value);
  +  new HttpSessionBindingEvent((HttpSession) getSession(), name, value);
   if ((value != null) &&
   (value instanceof HttpSessionBindingListener))
   try {
  
  
  
  1.28  +0 -2  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java
  
  Index: SimpleTcpReplicationManager.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SimpleTcpReplicationManager.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- SimpleTcpReplicationManager.java  29 May 2004 02:48:16 -  1.27
  +++ SimpleTcpReplicationManager.java  2 Jun 2004 14:10:01 -   1.28
  @@ -547,8 +547,6 @@
   String id = oin.readUTF();
   byte[] data = (byte[])oin.readObject();
   Session session = readSession(data,id);
  -session.setManager(this);
  -add(session);
   }//for
   stateTransferred=true;
   break;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaSession.java

2004-05-26 Thread yoavs
yoavs   2004/05/26 09:37:47

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaSession.java
  Log:
  Minor JavaDoc fixes (Bugzilla 28335)
  
  Revision  ChangesPath
  1.23  +2 -3  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
  
  Index: DeltaSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- DeltaSession.java 27 Apr 2004 17:50:43 -  1.22
  +++ DeltaSession.java 26 May 2004 16:37:47 -  1.23
  @@ -302,7 +302,6 @@
   /**
* returns true if this session is the primary session, if that is the
* case, the manager can expire it upon timeout.
  - * @return
*/
   public boolean isPrimarySession() {
  return isPrimarySession;
  @@ -310,7 +309,7 @@
   
   /**
* Sets whether this is the primary session or not.
  - * @param primarySession
  + * @param primarySession Flag value
*/
   public void setPrimarySession(boolean primarySession) {
   this.isPrimarySession=primarySession;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



RE: cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaSession.java

2004-04-05 Thread Filip Hanik \(lists\)
for the longest time the standard session wasn't extendable.
I would have loved to do that a long time ago, now it is just a matter of
time before I will do it.

5.0.22 would be good :)
thanks
Filip

-Original Message-
From: Remy Maucherat [mailto:[EMAIL PROTECTED]
Sent: Friday, April 02, 2004 5:18 AM
To: Tomcat Developers List
Subject: Re: cvs commit:
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cl
uster/session DeltaSession.java


[EMAIL PROTECTED] wrote:
> fhanik  2004/04/01 13:06:50
>
>   Modified:
modules/cluster/src/share/org/apache/catalina/cluster/session
> DeltaSession.java
>   Log:
>   bugfix for 28131, thanks to rainer.jung  -at- kippdata.de

So I assume you're going to want a 5.0.22 ? :(

This is a consequence of not extending StandardSession. Is this really
not possible to do ?
In JBoss, it works fine, and it avoids that kind of maintenance issue.

Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
---
Incoming mail is certified Virus Free.
Checked by AVG anti-virus system (http://www.grisoft.com).
Version: 6.0.614 / Virus Database: 393 - Release Date: 3/5/2004

---
Outgoing mail is certified Virus Free.
Checked by AVG anti-virus system (http://www.grisoft.com).
Version: 6.0.614 / Virus Database: 393 - Release Date: 3/5/2004


-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



Re: cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaSession.java

2004-04-02 Thread Remy Maucherat
[EMAIL PROTECTED] wrote:
fhanik  2004/04/01 13:06:50

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaSession.java
  Log:
  bugfix for 28131, thanks to rainer.jung  -at- kippdata.de
So I assume you're going to want a 5.0.22 ? :(

This is a consequence of not extending StandardSession. Is this really 
not possible to do ?
In JBoss, it works fine, and it avoids that kind of maintenance issue.

Rémy

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]


cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaSession.java

2004-04-01 Thread fhanik
fhanik  2004/04/01 13:06:50

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaSession.java
  Log:
  bugfix for 28131, thanks to rainer.jung  -at- kippdata.de
  
  Revision  ChangesPath
  1.20  +3 -3  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
  
  Index: DeltaSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- DeltaSession.java 27 Feb 2004 14:58:56 -  1.19
  +++ DeltaSession.java 1 Apr 2004 21:06:50 -   1.20
  @@ -295,7 +295,7 @@
   /**
* The access count for this session
*/
  -protected transient int accessCount = 1;
  +protected transient int accessCount = 0;
   
   // - Session Properties
   
  @@ -816,7 +816,7 @@
   id = null;
   lastAccessedTime = 0L;
   maxInactiveInterval = -1;
  -accessCount = 1;
  +accessCount = 0;
   notes.clear();
   setPrincipal(null);
   isNew = false;
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaSession.java

2004-02-12 Thread fhanik
fhanik  2004/02/12 13:10:32

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaSession.java
  Log:
  added binding event error protection, port from StandardSession
  
  Revision  ChangesPath
  1.17  +22 -8 
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
  
  Index: DeltaSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- DeltaSession.java 6 Feb 2004 17:30:13 -   1.16
  +++ DeltaSession.java 12 Feb 2004 21:10:32 -  1.17
  @@ -1317,7 +1317,11 @@
   // Call the valueBound() method if necessary
   if ( value instanceof HttpSessionBindingListener ) {
   event = new HttpSessionBindingEvent(this, name, value);
  -((HttpSessionBindingListener) value).valueBound(event);
  +try {
  +( (HttpSessionBindingListener) value).valueBound(event);
  +} catch ( Exception x ) {
  +log.error("Session binding listener throw an exception",x);
  +}
   }
   
   // Replace or add this attribute
  @@ -1326,8 +1330,13 @@
   // Call the valueUnbound() method if necessary
   if ((unbound != null) &&
   (unbound instanceof HttpSessionBindingListener)) {
  -((HttpSessionBindingListener) unbound).valueUnbound
  -  (new HttpSessionBindingEvent((HttpSession) this, name));
  +try {
  +( (HttpSessionBindingListener) unbound).valueUnbound
  +(new HttpSessionBindingEvent( (HttpSession)this, name));
  +} catch ( Exception x ) {
  +log.error("Session binding listener throw an exception",x);
  +}
  +
   }
   
   
  @@ -1641,7 +1650,12 @@
 new HttpSessionBindingEvent((HttpSession) this, name, value);
   if ((value != null) &&
   (value instanceof HttpSessionBindingListener))
  -((HttpSessionBindingListener) value).valueUnbound(event);
  +try {
  +( (HttpSessionBindingListener) value).valueUnbound(event);
  +} catch ( Exception x ) {
  +log.error("Session binding listener throw an exception",x);
  +}
  +
   
   // Notify interested application event listeners
   Context context = (Context) manager.getContainer();
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaSession.java SerializablePrincipal.java

2004-02-05 Thread fhanik
fhanik  2004/02/05 18:09:38

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaSession.java SerializablePrincipal.java
  Log:
  fixed serialization of principal when replicating data, this is currently hard coded 
to the GenericPrincipal.
  
  Revision  ChangesPath
  1.14  +8 -8  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
  
  Index: DeltaSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- DeltaSession.java 5 Feb 2004 22:57:52 -   1.13
  +++ DeltaSession.java 6 Feb 2004 02:09:38 -   1.14
  @@ -1419,8 +1419,7 @@
   boolean hasPrincipal = stream.readBoolean();
   principal = null;   
   if ( hasPrincipal ) {
  -SerializablePrincipal p = (SerializablePrincipal)stream.readObject();
  -principal = p.getPrincipal(getManager().getContainer().getRealm());
  +principal = 
SerializablePrincipal.readPrincipal(stream,getManager().getContainer().getRealm());
   }
   
   //setId((String) stream.readObject());
  @@ -1479,8 +1478,9 @@
   stream.writeObject(new Boolean(isValid));
   stream.writeObject(new Long(thisAccessedTime));
   stream.writeBoolean(getPrincipal()!=null);
  -if (getPrincipal() != null) stream.writeObject(SerializablePrincipal.
  -createPrincipal( (GenericPrincipal) getPrincipal()));
  +if (getPrincipal() != null) {
  +
SerializablePrincipal.writePrincipal((GenericPrincipal)principal,stream);
  +}
   
   stream.writeObject(id);
   if (log.isDebugEnabled())
  
  
  
  1.2   +22 -4 
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java
  
  Index: SerializablePrincipal.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/SerializablePrincipal.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- SerializablePrincipal.java19 Feb 2003 20:32:10 -  1.1
  +++ SerializablePrincipal.java6 Feb 2004 02:09:38 -   1.2
  @@ -212,6 +212,24 @@
   {
   return new 
GenericPrincipal(realm,name,password,getRoles()!=null?Arrays.asList(getRoles()):null);
   }
  +
  +public static GenericPrincipal readPrincipal(java.io.ObjectInputStream in, 
Realm realm) throws java.io.IOException{
  +String name = in.readUTF();
  +String pwd = in.readUTF();
  +int size = in.readInt();
  +String[] roles = new String[size];
  +for ( int i=0; i

cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaSession.java

2004-01-21 Thread remm
remm2004/01/21 11:00:19

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaSession.java
  Log:
  - Fix build: add endSession method.
  - This class will likely need to extend StandardSession instead of duplicating
code.
  
  Revision  ChangesPath
  1.10  +9 -4  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
  
  Index: DeltaSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DeltaSession.java 15 Jan 2004 05:29:06 -  1.9
  +++ DeltaSession.java 21 Jan 2004 19:00:19 -  1.10
  @@ -681,6 +681,11 @@
   }
   
   
  +public void endAccess() {
  +// FIXME
  +}
  +
  +
   /**
* Add a session event listener to this component.
*/
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]



cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session DeltaSession.java

2003-11-18 Thread fhanik
fhanik  2003/11/18 11:27:55

  Modified:modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaSession.java
  Log:
  modified the Delta session with a patch from T4,
  
  Revision  ChangesPath
  1.4   +6 -6  
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java
  
  Index: DeltaSession.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaSession.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DeltaSession.java 15 Nov 2003 00:58:20 -  1.3
  +++ DeltaSession.java 18 Nov 2003 19:27:55 -  1.4
  @@ -229,7 +229,7 @@
   /**
* Descriptive information describing this Session implementation.
*/
  -private static final String info = "StandardSession/1.0";
  +private static final String info = "DeltaSession/1.0";
   
   
   /**
  @@ -958,7 +958,7 @@
*/
   public long getCreationTime() {
   
  -if (!isValid())
  +   if (!expiring && !isValid)
   throw new IllegalStateException
   (sm.getString("standardSession.getCreationTime.ise"));
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]