You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by ha...@apache.org on 2002/03/30 08:49:13 UTC

cvs commit: jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl AbstractAltrmiFactory.java BaseServedObject.java

hammant     02/03/29 23:49:13

  Modified:    altrmi/src/java/org/apache/commons/altrmi/client/impl
                        AbstractAltrmiFactory.java BaseServedObject.java
  Log:
  Part two of DGC.  Suggestions from Vinay
  
  Revision  Changes    Path
  1.17      +2 -23     jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/AbstractAltrmiFactory.java
  
  Index: AbstractAltrmiFactory.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/AbstractAltrmiFactory.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- AbstractAltrmiFactory.java	27 Mar 2002 21:12:33 -0000	1.16
  +++ AbstractAltrmiFactory.java	30 Mar 2002 07:49:13 -0000	1.17
  @@ -27,8 +27,6 @@
   
   import java.io.IOException;
   import java.lang.ref.WeakReference;
  -import java.lang.ref.ReferenceQueue;
  -import java.lang.ref.Reference;
   
   
   /**
  @@ -36,12 +34,11 @@
    *
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
  - * @version $Revision: 1.16 $
  + * @version $Revision: 1.17 $
    */
   public abstract class AbstractAltrmiFactory implements AltrmiFactory {
   
       protected AbstractHostContext mHostContext;
  -    protected ReferenceQueue mDisposedFacadeQueue = new ReferenceQueue();
       protected final HashMap mRefObjs = new HashMap();
       private final boolean mBeanOnly;
       private transient String mTextToSign;
  @@ -118,7 +115,7 @@
        *
        */
       public final void registerReferenceObject(Object obj, Long referenceID) {
  -        mRefObjs.put(referenceID, new WeakReference(obj, mDisposedFacadeQueue));
  +        mRefObjs.put(referenceID, new WeakReference(obj));
           //Object o = mRefObjs.get(referenceID);
       }
   
  @@ -197,22 +194,4 @@
               return new String[]{};
           }
       }
  -
  -    public Long[] getDisposedOfFacades() {
  -        Vector vec = new Vector();
  -        try {
  -            Reference wr = mDisposedFacadeQueue.remove(0);
  -            while (wr != null) {
  -                AltrmiProxy ap = (AltrmiProxy) wr.get();
  -                vec.add(ap.altrmiGetReferenceID(this));
  -                wr = mDisposedFacadeQueue.remove(0);
  -            }
  -        } catch (InterruptedException e) {
  -            // do nothing
  -        }
  -        Long[] deadRefs = new Long[vec.size()];
  -        vec.copyInto(deadRefs);
  -        return deadRefs;
  -    }
  -
   }
  
  
  
  1.15      +6 -1      jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/BaseServedObject.java
  
  Index: BaseServedObject.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/altrmi/src/java/org/apache/commons/altrmi/client/impl/BaseServedObject.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- BaseServedObject.java	27 Mar 2002 21:12:33 -0000	1.14
  +++ BaseServedObject.java	30 Mar 2002 07:49:13 -0000	1.15
  @@ -32,7 +32,7 @@
    *
    * @author Paul Hammant <a href="mailto:Paul_Hammant@yahoo.com">Paul_Hammant@yahoo.com</a>
    * @author Vinay Chandrasekharan <a href="mailto:vinay_chandran@users.sourceforge.net">vinay_chandran@users.sourceforge.net</a>
  - * @version $Revision: 1.14 $
  + * @version $Revision: 1.15 $
    */
   public final class BaseServedObject {
   
  @@ -344,5 +344,10 @@
           } else {
               return null;
           }
  +    }
  +
  +    protected void finalize() throws Throwable {
  +        //System.out.println("BO finalizing");
  +        super.finalize();
       }
   }
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>