fhanik 2004/10/26 07:52:17
Modified: modules/cluster/src/share/org/apache/catalina/cluster/session
DeltaRequest.java
Log:
Sort of fix for bug 31328 which is not valid
Revision Changes Path
1.10 +10 -4
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaRequest.java
Index: DeltaRequest.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/session/DeltaRequest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DeltaRequest.java 29 Sep 2004 16:43:44 -0000 1.9
+++ DeltaRequest.java 26 Oct 2004 14:52:17 -0000 1.10
@@ -104,7 +104,13 @@
}
//if we have already done something to this attribute, make sure
//we don't send multiple actions across the wire
- if ( !recordAllActions) actions.remove(info);
+ if ( !recordAllActions) {
+ try {
+ actions.remove(info);
+ } catch (java.util.NoSuchElementException x) {
+ //do nothing, we wanted to remove it anyway
+ }
+ }
//add the action
actions.addLast(info);
}
@@ -177,7 +183,7 @@
actionPool.clear();
}
- public void readExternal(java.io.ObjectInput in) throws java.io.IOException,
+ public synchronized void readExternal(java.io.ObjectInput in) throws
java.io.IOException,
java.lang.ClassNotFoundException {
//sessionId - String
//recordAll - boolean
@@ -206,7 +212,7 @@
- public void writeExternal(java.io.ObjectOutput out ) throws java.io.IOException
{
+ public synchronized void writeExternal(java.io.ObjectOutput out ) throws
java.io.IOException {
//sessionId - String
//recordAll - boolean
//size - int
@@ -220,7 +226,7 @@
}
}
- public static class AttributeInfo implements java.io.Externalizable {
+ private static class AttributeInfo implements java.io.Externalizable {
private String name = null;
private Object value = null;
private int action;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
