Merge 3.2 to HEAD:

17443: Port fix for cannot delete file via CIFS that has a thumbnail associated with it. ETHREEOH-3143 and ETHREEOH-3115.
          Port fix for CIFS/Kerberos/SPNEGO logon problem with Win2008/Win7 client. ETHREEOH-3225.
   17444: Update svn:mergeinfo (Record-only)
   17512: Fix for no sites in AVM folder via CIFS/FTP when Kerberos auth enabled. ETHREEOH-3080.
   17849: Re-use open files for the same session/process id. Port of ETWOTWO-1250.
   17853: Rewrite the rename file logic to handle MS Office file rename patterns. Port of ETHREEOH-1951.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18269 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/java/org/alfresco/filesys/repo/NodeRefNetworkFile.java

@@ -38,6 +38,16 @@ public abstract class NodeRefNetworkFile extends AlfrescoNetworkFile {
 	
 	protected NodeRef m_nodeRef;
 	
+	// Process id of the owner
+	
+	protected int m_pid;
+	
+	// Reference count of file opens
+	//
+	// The same file stream may be re-used if the same process/client opens it multiple times
+	
+	private int m_openCount = 1;
+	
     /**
      * Create a network file object with the specified file/directory name.
      * 
@@ -80,4 +90,49 @@ public abstract class NodeRefNetworkFile extends AlfrescoNetworkFile {
 	{
 		m_nodeRef = nodeRef;
 	}
+	
+	/**
+	 * Return the process id of the owner
+	 * 
+	 * @return int
+	 */
+	public final int getProcessId() {
+		return m_pid;
+	}
+	
+	/**
+	 * Set the owner process id
+	 * 
+	 * @param pid int
+	 */
+	public final void setProcessId(int pid) {
+		m_pid = pid;
+	}
+	
+	/**
+	 * Increment the file open count
+	 * 
+	 * @return int
+	 */
+	public synchronized final int incrementOpenCount() {
+		return ++m_openCount;
+	}
+	
+	/**
+	 * Decrement the file open count
+	 * 
+	 * @return int
+	 */
+	public synchronized final int decrementOpenCount() {
+		return --m_openCount;
+	}
+	
+	/**
+	 * Return the open file count
+	 * 
+	 * @return int
+	 */
+	public final int getOpenCount() {
+		return m_openCount;
+	}
 }