# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /data/work/src/netbeans-cm
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: masterfs/src/org/netbeans/modules/masterfs/ProvidedExtensionsProxy.java
--- masterfs/src/org/netbeans/modules/masterfs/ProvidedExtensionsProxy.java Base (BASE)
+++ masterfs/src/org/netbeans/modules/masterfs/ProvidedExtensionsProxy.java Locally Modified (Based On LOCAL)
@@ -58,6 +58,7 @@
 import org.netbeans.modules.masterfs.providers.ProvidedExtensions;
 import org.netbeans.modules.masterfs.providers.ProvidedExtensions.IOHandler;
 import org.openide.filesystems.FileObject;
+import org.openide.util.Exceptions;
 
 /**
  *
@@ -249,16 +250,17 @@
         }
     }
 
-    public void fileLocked(final FileObject fo) {
+    public void fileLocked(final FileObject fo) throws IOException {
         for (Iterator it = annotationProviders.iterator(); it.hasNext();) {
             AnnotationProvider provider = (AnnotationProvider) it.next();
             final InterceptionListener iListener = (provider != null) ?  provider.getInterceptionListener() : null;
             if (iListener instanceof ProvidedExtensions) {
-                runCheckCode(new Runnable() {
-                    public void run() {
+                try {
+                    reentrantCheck.set(Boolean.TRUE);
                         ((ProvidedExtensions)iListener).fileLocked(fo);
+                } finally {
+                    reentrantCheck.set(null);
                     }
-                });                                                
             }
         }
     }
Index: masterfs/src/org/netbeans/modules/masterfs/providers/ProvidedExtensions.java
--- masterfs/src/org/netbeans/modules/masterfs/providers/ProvidedExtensions.java Base (BASE)
+++ masterfs/src/org/netbeans/modules/masterfs/providers/ProvidedExtensions.java Locally Modified (Based On LOCAL)
@@ -301,7 +301,7 @@
      * @param fo file which was locked
      * @since 1.11
      */            
-    public void fileLocked(FileObject fo) {}    
+    public void fileLocked(FileObject fo) throws IOException {}    
     
     /*
      * Called by <code>MasterFileSystem</code> after <code>FileLock</code>
Index: masterfs/test/unit/src/org/netbeans/modules/masterfs/providers/ProvidedExtensionsTest.java
--- masterfs/test/unit/src/org/netbeans/modules/masterfs/providers/ProvidedExtensionsTest.java Base (BASE)
+++ masterfs/test/unit/src/org/netbeans/modules/masterfs/providers/ProvidedExtensionsTest.java Locally Modified (Based On LOCAL)
@@ -706,7 +706,7 @@
             return super.canWrite(f);
         }
 
-        public void fileLocked(FileObject fo) {
+        public void fileLocked(FileObject fo) throws IOException {
             super.fileLocked(fo);
             implsFileLockCalls++;
         }
Index: subversion/test/unit/src/org/netbeans/modules/subversion/TestAnnotationProvider.java
--- subversion/test/unit/src/org/netbeans/modules/subversion/TestAnnotationProvider.java Base (BASE)
+++ subversion/test/unit/src/org/netbeans/modules/subversion/TestAnnotationProvider.java Locally Modified (Based On LOCAL)
@@ -44,6 +44,7 @@
 
 import java.awt.Image;
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -135,7 +136,7 @@
         }
 
         @Override
-        public void fileLocked(FileObject fo) {
+        public void fileLocked(FileObject fo) throws IOException {
             events.add("fileLocked " + fo);
             super.fileLocked(fo);
         }
Index: versioning.core/src/org/netbeans/modules/versioning/core/filesystems/VCSFilesystemInterceptor.java
--- versioning.core/src/org/netbeans/modules/versioning/core/filesystems/VCSFilesystemInterceptor.java Base (BASE)
+++ versioning.core/src/org/netbeans/modules/versioning/core/filesystems/VCSFilesystemInterceptor.java Locally Modified (Based On LOCAL)
@@ -377,7 +377,7 @@
      *
      * @param fo a VCSFileProxy
      */
-    public static void fileLocked(VCSFileProxy fo) {
+    public static void fileLocked(VCSFileProxy fo) throws IOException {
         LOG.log(Level.FINE, "fileLocked {0}", fo);
         getInterceptor(fo, "beforeEdit").beforeEdit();           // NOI18N
     }
@@ -690,7 +690,7 @@
             interceptor.beforeChange(file);
         }
 
-        public void beforeEdit() {
\ No newline at end of file
+        public void beforeEdit() throws IOException {
\ No newline at end of file
             lhInterceptor.beforeEdit(file);
             interceptor.beforeEdit(file);
         }
Index: versioning.core/src/org/netbeans/modules/versioning/core/spi/VCSInterceptor.java
--- versioning.core/src/org/netbeans/modules/versioning/core/spi/VCSInterceptor.java Base (BASE)
+++ versioning.core/src/org/netbeans/modules/versioning/core/spi/VCSInterceptor.java Locally Modified (Based On LOCAL)
@@ -263,7 +263,7 @@
      * 
      * @param file file that was just locked and is expected to change
      */
-    public void beforeEdit(VCSFileProxy file) {
+    public void beforeEdit(VCSFileProxy file) throws IOException {
     }
 
     /** Allows versioning system to exclude some children from recursive
Index: versioning.core/test/unit/src/org/netbeans/modules/versioning/core/FSInterceptorTest.java
--- versioning.core/test/unit/src/org/netbeans/modules/versioning/core/FSInterceptorTest.java Base (BASE)
+++ versioning.core/test/unit/src/org/netbeans/modules/versioning/core/FSInterceptorTest.java Locally Modified (Based On LOCAL)
@@ -167,7 +167,7 @@
         }
 
         @Override
-        public void beforeEdit(VCSFileProxy file) {
+        public void beforeEdit(VCSFileProxy file) throws IOException {
             storeMethodName();
             super.beforeEdit(file);
         }
Index: versioning.masterfs/src/org/netbeans/modules/versioning/masterfs/FilesystemInterceptor.java
--- versioning.masterfs/src/org/netbeans/modules/versioning/masterfs/FilesystemInterceptor.java Base (BASE)
+++ versioning.masterfs/src/org/netbeans/modules/versioning/masterfs/FilesystemInterceptor.java Locally Modified (Based On LOCAL)
@@ -304,7 +304,7 @@
      * @param fo a FileObject
      */
     @Override
-    public void fileLocked(FileObject fo) {
+    public void fileLocked(FileObject fo) throws IOException {
         VCSFilesystemInterceptor.fileLocked(VCSFileProxy.createFileProxy(fo));
     }