[jBoss-Dev] CVS update: spyderMQ/src/java/org/spydermqSpySession.java SpyDistributedConnection.java

[jBoss CVS Development]

  User: juha    
  Date: 00/11/04 05:30:23

  Modified:    src/java/org/spydermq SpySession.java
                        SpyDistributedConnection.java
  Log:
  Updated to JMX RI released version.
  Two patches from John Ellis.
  
  Revision  Changes    Path
  1.9       +5 -1      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SpySession.java   2000/07/07 22:37:21     1.8
  +++ SpySession.java   2000/11/04 13:30:23     1.9
  @@ -29,7 +29,7 @@
    *      
    *   @author Norbert Lataille ([EMAIL PROTECTED])
    * 
  - *   @version $Revision: 1.8 $
  + *   @version $Revision: 1.9 $
    */
   public class SpySession 
        implements Runnable, Session
  @@ -258,6 +258,10 @@
   
        public synchronized void close() throws JMSException
        {
  +        // allow other threads to process before closing this session
  +        // Patch submitted by John Ellis (10/29/00)
  +        Thread.yield();
  +        
                if (closed) return;
                closed=true;
   
  
  
  
  1.6       +4 -1      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SpyDistributedConnection.java     2000/06/19 21:51:58     1.5
  +++ SpyDistributedConnection.java     2000/11/04 13:30:23     1.6
  @@ -15,7 +15,7 @@
    *      
    *   @author Norbert Lataille ([EMAIL PROTECTED])
    * 
  - *   @version $Revision: 1.5 $
  + *   @version $Revision: 1.6 $
    */
   public class SpyDistributedConnection 
        implements Serializable
  @@ -47,6 +47,9 @@
        
        public boolean equals(Object obj)
        {
  +        // Fixes NPE. Patch submitted by John Ellis (10/29/00)
  +        if (obj==null) return false;
  +        
                if (obj.getClass()!=SpyDistributedConnection.class) return false;
                if (obj.hashCode()!=hash) return false;
                if (clientID==null) return true;