[ jEdit-commits ] SF.net SVN: jedit:[15268] plugins/JDiffPlugin/trunk/jdiff/util/DualDiffUtil .java

[<dal...@us...>]

Revision: 15268
          http://jedit.svn.sourceforge.net/jedit/?rev=15268&view=rev
Author:   daleanson
Date:     2009-05-12 17:32:38 +0000 (Tue, 12 May 2009)

Log Message:
-----------
added readLock/readUnlock to protect against the buffer from being modified while line data is gathered.

Modified Paths:
--------------
    plugins/JDiffPlugin/trunk/jdiff/util/DualDiffUtil.java

Modified: plugins/JDiffPlugin/trunk/jdiff/util/DualDiffUtil.java
===================================================================
--- plugins/JDiffPlugin/trunk/jdiff/util/DualDiffUtil.java	2009-05-12 10:30:34 UTC (rev 15267)
+++ plugins/JDiffPlugin/trunk/jdiff/util/DualDiffUtil.java	2009-05-12 17:32:38 UTC (rev 15268)
@@ -148,6 +148,7 @@
     }
 
     public static FileLine[] getFileLines( DualDiff dualDiff, Buffer buffer ) {
+        buffer.readLock();
         FileLine[] lines = new FileLine[ buffer.getLineCount() ];
 
         for ( int i = buffer.getLineCount() - 1; i >= 0; i-- ) {
@@ -182,7 +183,7 @@
 
             lines[ i ] = new FileLine( text, canonical );
         }
-
+        buffer.readUnlock();
         return lines;
     }
 


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