Big honkin' merge from head. Sheesh!

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/filesys/ftp/FTPDataSession.java

@@ -568,6 +568,22 @@ public class FTPDataSession extends SrvSession implements Runnable
                 netFile = disk.openFile( this, tree, params);
             }
 
+            // Commit any current transaction
+            
+            try
+            {
+                // Commit or rollback the transaction
+
+                endTransaction();
+            }
+            catch ( Exception ex)
+            {
+                // Debug
+                
+                if ( logger.isDebugEnabled())
+                    logger.debug("Error committing transaction", ex);
+            }
+            
             // Check if the file has been opened
 
             if (netFile == null)
@@ -776,6 +792,22 @@ public class FTPDataSession extends SrvSession implements Runnable
                 netFile = disk.createFile(this, tree, params);
             }
 
+            // Commit any current transaction
+            
+            try
+            {
+                // Commit or rollback the transaction
+
+                endTransaction();
+            }
+            catch ( Exception ex)
+            {
+                // Debug
+                
+                if ( logger.isDebugEnabled())
+                    logger.debug("Error committing transaction", ex);
+            }
+            
             // Notify change listeners that a new file has been created
 
             DiskDeviceContext diskCtx = (DiskDeviceContext) tree.getContext();