Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)

125605 rmunteanu: Merged 5.1.1 (5.1.1) to 5.1.N (5.1.2)
      125498 slanglois: MNT-16155 Update source headers - remove svn:eol-style property on Java and JSP source files


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@125783 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2016-04-26 13:03:25 +00:00
parent 8674e2bfc8
commit dc6b2852d0
830 changed files with 142585 additions and 142585 deletions

View File

@@ -1,212 +1,212 @@
package org.alfresco.filesys.repo;
import java.io.File;
import java.io.IOException;
import java.io.Reader;
import org.alfresco.filesys.alfresco.NetworkFileLegacyReferenceCount;
import org.alfresco.jlan.server.filesys.FileAttribute;
import org.alfresco.jlan.server.filesys.cache.FileState;
import org.alfresco.jlan.server.filesys.cache.NetworkFileStateInterface;
import org.alfresco.jlan.smb.server.disk.JavaNetworkFile;
/**
* Temporary Java backed network file.
*
* @author mrogers
*/
public class TempNetworkFile extends JavaNetworkFile
implements NetworkFileStateInterface,
NetworkFileLegacyReferenceCount
{
private boolean changed = false;
boolean modificationDateSetDirectly = false;
/**
* Create a new temporary file with no existing content.
*
* @param file the underlying File
* @param netPath where in the repo this file is going.
*/
public TempNetworkFile(File file, String netPath)
{
super(file, netPath);
setFullName(netPath);
setAttributes(FileAttribute.NTNormal);
setClosed(false);
}
/**
* A new temporary network file with some existing content.
* @param file File
* @param netPath String
* @param existingContent Reader
*/
public TempNetworkFile(File file, String netPath, Reader existingContent)
{
super(file, netPath);
setFullName(netPath);
setAttributes(FileAttribute.NTNormal);
setClosed(false);
}
/**
* Access to the underlying file.
* @return the file.
*/
public File getFile()
{
return m_file;
}
public String toString()
{
return "TempNetworkFile:" + getFullName() + " path: " + m_file.getAbsolutePath();
}
@Override
public int readFile(byte[] buf, int len, int pos, long fileOff)
throws java.io.IOException
{
if(fileState != null)
{
fileState.updateAccessDateTime();
}
return super.readFile(buf, len, pos, fileOff);
}
@Override
public void writeFile(byte[] buf, int len, int pos) throws IOException
{
changed = true;
super.writeFile(buf, len, pos);
long size = m_io.length();
setFileSize(size);
if(fileState != null)
{
fileState.updateModifyDateTime();
fileState.updateAccessDateTime();
fileState.setFileSize(size);
fileState.setAllocationSize((size + 512L) & 0xFFFFFFFFFFFFFE00L);
}
}
@Override
public void writeFile(byte[] buffer, int length, int position, long fileOffset)
throws IOException
{
changed = true;
super.writeFile(buffer, length, position, fileOffset);
long size = m_io.length();
setFileSize(size);
if(fileState != null)
{
fileState.updateModifyDateTime();
fileState.updateAccessDateTime();
fileState.setFileSize(size);
fileState.setAllocationSize((size + 512L) & 0xFFFFFFFFFFFFFE00L);
}
}
@Override
public void truncateFile(long size) throws IOException
{
super.truncateFile(size);
if(size == 0)
{
changed = true;
}
setFileSize(size);
if(fileState != null)
{
fileState.updateModifyDateTime();
fileState.updateAccessDateTime();
fileState.setFileSize(size);
fileState.setAllocationSize((size + 512L) & 0xFFFFFFFFFFFFFE00L);
}
}
// For JLAN file state lock manager
public void setFileState(FileState fileState)
{
this.fileState = fileState;
}
@Override
public FileState getFileState()
{
return fileState;
}
/**
* Tell JLAN it needs to call disk.closeFile rather than short cutting.
* @return boolean
*/
public boolean allowsOpenCloseViaNetworkFile() {
return false;
}
public void setChanged(boolean changed)
{
this.changed = changed;
}
public boolean isChanged()
{
return changed;
}
public boolean isModificationDateSetDirectly()
{
return modificationDateSetDirectly;
}
public void setModificationDateSetDirectly(boolean modificationDateSetDirectly)
{
this.modificationDateSetDirectly = modificationDateSetDirectly;
}
private int legacyOpenCount = 0;
/**
* Increment the legacy file open count
*
* @return int
*/
public synchronized final int incrementLegacyOpenCount() {
legacyOpenCount++;
return legacyOpenCount;
}
/**
* Decrement the legacy file open count
*
* @return int
*/
public synchronized final int decrementLagacyOpenCount() {
legacyOpenCount--;
return legacyOpenCount;
}
/**
* Return the legacy open file count
*
* @return int
*/
public final int getLegacyOpenCount() {
return legacyOpenCount;
}
private FileState fileState;
}
package org.alfresco.filesys.repo;
import java.io.File;
import java.io.IOException;
import java.io.Reader;
import org.alfresco.filesys.alfresco.NetworkFileLegacyReferenceCount;
import org.alfresco.jlan.server.filesys.FileAttribute;
import org.alfresco.jlan.server.filesys.cache.FileState;
import org.alfresco.jlan.server.filesys.cache.NetworkFileStateInterface;
import org.alfresco.jlan.smb.server.disk.JavaNetworkFile;
/**
* Temporary Java backed network file.
*
* @author mrogers
*/
public class TempNetworkFile extends JavaNetworkFile
implements NetworkFileStateInterface,
NetworkFileLegacyReferenceCount
{
private boolean changed = false;
boolean modificationDateSetDirectly = false;
/**
* Create a new temporary file with no existing content.
*
* @param file the underlying File
* @param netPath where in the repo this file is going.
*/
public TempNetworkFile(File file, String netPath)
{
super(file, netPath);
setFullName(netPath);
setAttributes(FileAttribute.NTNormal);
setClosed(false);
}
/**
* A new temporary network file with some existing content.
* @param file File
* @param netPath String
* @param existingContent Reader
*/
public TempNetworkFile(File file, String netPath, Reader existingContent)
{
super(file, netPath);
setFullName(netPath);
setAttributes(FileAttribute.NTNormal);
setClosed(false);
}
/**
* Access to the underlying file.
* @return the file.
*/
public File getFile()
{
return m_file;
}
public String toString()
{
return "TempNetworkFile:" + getFullName() + " path: " + m_file.getAbsolutePath();
}
@Override
public int readFile(byte[] buf, int len, int pos, long fileOff)
throws java.io.IOException
{
if(fileState != null)
{
fileState.updateAccessDateTime();
}
return super.readFile(buf, len, pos, fileOff);
}
@Override
public void writeFile(byte[] buf, int len, int pos) throws IOException
{
changed = true;
super.writeFile(buf, len, pos);
long size = m_io.length();
setFileSize(size);
if(fileState != null)
{
fileState.updateModifyDateTime();
fileState.updateAccessDateTime();
fileState.setFileSize(size);
fileState.setAllocationSize((size + 512L) & 0xFFFFFFFFFFFFFE00L);
}
}
@Override
public void writeFile(byte[] buffer, int length, int position, long fileOffset)
throws IOException
{
changed = true;
super.writeFile(buffer, length, position, fileOffset);
long size = m_io.length();
setFileSize(size);
if(fileState != null)
{
fileState.updateModifyDateTime();
fileState.updateAccessDateTime();
fileState.setFileSize(size);
fileState.setAllocationSize((size + 512L) & 0xFFFFFFFFFFFFFE00L);
}
}
@Override
public void truncateFile(long size) throws IOException
{
super.truncateFile(size);
if(size == 0)
{
changed = true;
}
setFileSize(size);
if(fileState != null)
{
fileState.updateModifyDateTime();
fileState.updateAccessDateTime();
fileState.setFileSize(size);
fileState.setAllocationSize((size + 512L) & 0xFFFFFFFFFFFFFE00L);
}
}
// For JLAN file state lock manager
public void setFileState(FileState fileState)
{
this.fileState = fileState;
}
@Override
public FileState getFileState()
{
return fileState;
}
/**
* Tell JLAN it needs to call disk.closeFile rather than short cutting.
* @return boolean
*/
public boolean allowsOpenCloseViaNetworkFile() {
return false;
}
public void setChanged(boolean changed)
{
this.changed = changed;
}
public boolean isChanged()
{
return changed;
}
public boolean isModificationDateSetDirectly()
{
return modificationDateSetDirectly;
}
public void setModificationDateSetDirectly(boolean modificationDateSetDirectly)
{
this.modificationDateSetDirectly = modificationDateSetDirectly;
}
private int legacyOpenCount = 0;
/**
* Increment the legacy file open count
*
* @return int
*/
public synchronized final int incrementLegacyOpenCount() {
legacyOpenCount++;
return legacyOpenCount;
}
/**
* Decrement the legacy file open count
*
* @return int
*/
public synchronized final int decrementLagacyOpenCount() {
legacyOpenCount--;
return legacyOpenCount;
}
/**
* Return the legacy open file count
*
* @return int
*/
public final int getLegacyOpenCount() {
return legacyOpenCount;
}
private FileState fileState;
}