[Jython-checkins] SF.net SVN: jython: [4929] branches/advanced

[<th...@us...>]

Revision: 4929
          http://jython.svn.sourceforge.net/jython/?rev=4929&view=rev
Author:   thobes
Date:     2008-07-14 10:41:33 -0700 (Mon, 14 Jul 2008)

Log Message:
-----------
Verifying that svnmerge works on the advanced branch now.
Merged revisions 4928 via svnmerge from 
https://jython.svn.sourceforge.net/svnroot/jython/branches/asm

........
  r4928 | zyasoft | 2008-07-14 17:19:01 +0200 (Mon, 14 Jul 2008) | 3 lines
  
  ReferenceQueue objs, by their nature, only make sense if transient.
  So make them so, this enables interoperation with Terracotta. 
........

Modified Paths:
--------------
    branches/advanced/src/org/python/core/AutoInternalTables.java
    branches/advanced/src/org/python/core/IdImpl.java

Property Changed:
----------------
    branches/advanced/


Property changes on: branches/advanced
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/asm:1-4926
   + /branches/asm:1-4928

Modified: branches/advanced/src/org/python/core/AutoInternalTables.java
===================================================================
--- branches/advanced/src/org/python/core/AutoInternalTables.java	2008-07-14 15:19:01 UTC (rev 4928)
+++ branches/advanced/src/org/python/core/AutoInternalTables.java	2008-07-14 17:41:33 UTC (rev 4929)
@@ -8,7 +8,7 @@
 
 public abstract class AutoInternalTables extends InternalTables {
 
-    protected ReferenceQueue queue = new ReferenceQueue();
+    protected transient ReferenceQueue queue = new ReferenceQueue();
 
     protected abstract Reference newAutoRef(short type, Object key,
                                             Object obj);

Modified: branches/advanced/src/org/python/core/IdImpl.java
===================================================================
--- branches/advanced/src/org/python/core/IdImpl.java	2008-07-14 15:19:01 UTC (rev 4928)
+++ branches/advanced/src/org/python/core/IdImpl.java	2008-07-14 17:41:33 UTC (rev 4929)
@@ -8,7 +8,7 @@
 
     public static class WeakIdentityMap {
         
-        private ReferenceQueue refqueue = new ReferenceQueue();
+        private transient ReferenceQueue refqueue = new ReferenceQueue();
         private HashMap hashmap = new HashMap();
         
         private void cleanup() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.