[Pydev-cvs] org.python.pydev/src/org/python/pydev/editor PyReconciler.java, 1.1, 1.2

[Fabio Z. <fa...@us...>]

Update of /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29212/src/org/python/pydev/editor

Modified Files:
	PyReconciler.java 
Log Message:
Checking lock on PyReconciler.

Index: PyReconciler.java
===================================================================
RCS file: /cvsroot/pydev/org.python.pydev/src/org/python/pydev/editor/PyReconciler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PyReconciler.java	14 Dec 2007 00:09:06 -0000	1.1
--- PyReconciler.java	19 Jul 2008 22:50:16 -0000	1.2
***************
*** 52,58 ****
          private Map fAddAnnotations;
  
-         /** Lock object for modifying the annotations. */
-         private Object fLockObject;
- 
          /**
           * Initializes this collector with the given annotation model.
--- 52,55 ----
***************
*** 63,70 ****
              Assert.isLegal(annotationModel != null);
              fAnnotationModel = annotationModel;
-             if (fAnnotationModel instanceof ISynchronizable)
-                 fLockObject = ((ISynchronizable) fAnnotationModel).getLockObject();
-             else
-                 fLockObject = fAnnotationModel;
          }
  
--- 60,63 ----
***************
*** 93,96 ****
--- 86,96 ----
              List toRemove = new ArrayList();
  
+             Object fLockObject;
+             if (fAnnotationModel instanceof ISynchronizable){
+                 fLockObject = ((ISynchronizable) fAnnotationModel).getLockObject();
+             }else{
+                 fLockObject = new Object();
+             }
+ 
              synchronized (fLockObject) {
                  Iterator iter = fAnnotationModel.getAnnotationIterator();