diff -u netbeans-6.5/debian/changelog netbeans-6.5/debian/changelog --- netbeans-6.5/debian/changelog +++ netbeans-6.5/debian/changelog @@ -1,3 +1,10 @@ +netbeans (6.5-0ubuntu3) karmic; urgency=low + + * Bug fix upload (LP: #353080) + - Added a critical patch 96-fix-lucene.patch + + -- Yulia Novozhilova Mon, 25 May 2009 23:28:08 +0400 + netbeans (6.5-0ubuntu2) jaunty; urgency=low * Added bugfix patches from 6.5.1 for NetBeans IDE (LP: #345562) only in patch2: unchanged: --- netbeans-6.5.orig/debian/patches/96-fix-lucene.patch +++ netbeans-6.5/debian/patches/96-fix-lucene.patch @@ -0,0 +1,43 @@ +diff -Nur -x '*.orig' -x '*~' netbeans-6.5.orig/java.source/src/org/netbeans/modules/java/source/usages/LuceneIndex.java netbeans-6.5/java.source/src/org/netbeans/modules/java/source/usages/LuceneIndex.java +--- netbeans-6.5.orig/java.source/src/org/netbeans/modules/java/source/usages/LuceneIndex.java 2009-05-25 22:49:34.000000000 +0400 ++++ netbeans-6.5/java.source/src/org/netbeans/modules/java/source/usages/LuceneIndex.java 2009-04-24 21:51:36.000000000 +0400 +@@ -871,7 +871,7 @@ + public synchronized void clear () throws IOException { + checkPreconditions(); + this.rootPkgCache = null; +- this.close (); ++ this.close (false); + try { + final String[] content = this.directory.list(); + boolean dirty = false; +@@ -914,20 +914,27 @@ + } + } finally { + //Need to recreate directory, see issue: #148374 ++ this.close(true); + this.directory = FSDirectory.getDirectory(refCacheRoot, NoLockFactory.getNoLockFactory()); //Locking controlled by rwlock + closed = false; + } + } ++ ++ public void close () throws IOException { ++ close(true); ++ } + +- public synchronized void close () throws IOException { ++ public synchronized void close (boolean closeDir) throws IOException { + try { + if (this.reader != null) { + this.reader.close(); + this.reader = null; + } + } finally { +- this.directory.close(); +- this.closed = true; ++ if (closeDir) { ++ this.directory.close(); ++ this.closed = true; ++ } + } + } +