User: norbert
Date: 00/06/15 15:50:30
Modified: src/java/org/spydermq SpyConnection.java
SpyDistributedConnection.java SpySession.java
Log:
More work on the OIL
Revision Changes Path
1.6 +2 -3 spyderMQ/src/java/org/spydermq/SpyConnection.java
Index: SpyConnection.java
===================================================================
RCS file: /products/cvs/ejboss/spyderMQ/src/java/org/spydermq/SpyConnection.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SpyConnection.java 2000/06/15 00:45:02 1.5
+++ SpyConnection.java 2000/06/15 22:50:29 1.6
@@ -29,7 +29,7 @@
*
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class SpyConnection
implements Connection, Serializable
@@ -389,8 +389,7 @@
{
try {
if (clientID==null) askForAnID();
- ConnectionReceiver
receiver=ConnectionReceiverFactory.createConnectionReceiver(this,crClassName);
- distributedConnection=new
SpyDistributedConnection(clientID,receiver);
+
distributedConnection=ConnectionReceiverFactory.createDistributedConnection(clientID,this,crClassName);
} catch (Exception e) {
failureHandler(e,"Cannot create a ConnectionReceiver");
}
1.4 +18 -10 spyderMQ/src/java/org/spydermq/SpyDistributedConnection.java
Index: SpyDistributedConnection.java
===================================================================
RCS file:
/products/cvs/ejboss/spyderMQ/src/java/org/spydermq/SpyDistributedConnection.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SpyDistributedConnection.java 2000/06/15 04:02:28 1.3
+++ SpyDistributedConnection.java 2000/06/15 22:50:29 1.4
@@ -14,23 +14,31 @@
*
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class SpyDistributedConnection
implements Serializable
{
- //NL : Do a better HashCode() and equals() !
private String clientID;
+ public transient ConnectionReceiver cr_;
public ConnectionReceiver cr;
public transient boolean listeners;
+ protected int hash;
- SpyDistributedConnection(String id,ConnectionReceiver cr_)
+ public SpyDistributedConnection(String clientID,ConnectionReceiver cr)
{
- clientID=id;
- cr=cr_;
+ this.clientID=clientID;
+ this.cr_=cr;
+ if (clientID==null) hash=0;
+ else hash=clientID.hashCode();
}
+ public void setConnectionReceiver(ConnectionReceiver cr)
+ {
+ this.cr=cr;
+ }
+
String getClientID()
{
return clientID;
@@ -38,14 +46,14 @@
public boolean equals(Object obj)
{
- if (obj instanceof ConnectionReceiver) return
cr.equals((ConnectionReceiver)obj);
- if (obj instanceof SpyDistributedConnection) return
clientID.equals(((SpyDistributedConnection)obj).clientID);
- return false;
+ if (obj.getClass()!=SpyDistributedConnection.class) return false;
+ if (obj.hashCode()!=hash) return false;
+ if (clientID==null) return true;
+ return ((SpyDistributedConnection)obj).clientID.equals(clientID);
}
public int hashCode()
{
- if (clientID==null) return 0;
- return clientID.hashCode();
+ return hash;
}
}
1.6 +3 -3 spyderMQ/src/java/org/spydermq/SpySession.java
Index: SpySession.java
===================================================================
RCS file: /products/cvs/ejboss/spyderMQ/src/java/org/spydermq/SpySession.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SpySession.java 2000/06/14 22:45:35 1.5
+++ SpySession.java 2000/06/15 22:50:29 1.6
@@ -28,7 +28,7 @@
*
* @author Norbert Lataille ([EMAIL PROTECTED])
*
- * @version $Revision: 1.5 $
+ * @version $Revision: 1.6 $
*/
public class SpySession
implements Runnable, Session
@@ -233,9 +233,9 @@
//If there was smthg to do, try again
if (doneJob) continue;
- Log.log("SessionThread: I'm going to bed...");
+ //Log.log("SessionThread: I'm going to bed...");
mutex.waitLock();
- Log.log("SessionThread: I wake up");
+ //Log.log("SessionThread: I wake up");
}
