You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by ng...@apache.org on 2008/07/31 14:36:48 UTC
svn commit: r681357 [2/2] - in
/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver: ./ command/
config/spring/ filesystem/ message/ ssl/ usermanager/
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_WHO.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_WHO.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_WHO.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_WHO.java Thu Jul 31 05:36:42 2008
@@ -47,9 +47,9 @@
/**
* Execute command.
*/
- public void execute(FtpIoSession session,
- FtpServerContext context,
- FtpRequest request) throws IOException, FtpException {
+ public void execute(final FtpIoSession session,
+ final FtpServerContext context,
+ final FtpRequest request) throws IOException, FtpException {
// reset state variables
session.resetState();
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_ZONE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_ZONE.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_ZONE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SITE_ZONE.java Thu Jul 31 05:36:42 2008
@@ -41,9 +41,9 @@
/**
* Execute command.
*/
- public void execute(FtpIoSession session,
- FtpServerContext context,
- FtpRequest request) throws IOException, FtpException {
+ public void execute(final FtpIoSession session,
+ final FtpServerContext context,
+ final FtpRequest request) throws IOException, FtpException {
// reset state variables
session.resetState();
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SIZE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SIZE.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SIZE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SIZE.java Thu Jul 31 05:36:42 2008
@@ -44,9 +44,9 @@
/**
* Execute command.
*/
- public void execute(FtpIoSession session,
- FtpServerContext context,
- FtpRequest request) throws IOException, FtpException {
+ public void execute(final FtpIoSession session,
+ final FtpServerContext context,
+ final FtpRequest request) throws IOException, FtpException {
// reset state variables
session.resetState();
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STAT.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STAT.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STAT.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STAT.java Thu Jul 31 05:36:42 2008
@@ -39,9 +39,9 @@
/**
* Execute command
*/
- public void execute(FtpIoSession session,
- FtpServerContext context,
- FtpRequest request) throws IOException {
+ public void execute(final FtpIoSession session,
+ final FtpServerContext context,
+ final FtpRequest request) throws IOException {
// reset state variables
session.resetState();
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOR.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOR.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOR.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOR.java Thu Jul 31 05:36:42 2008
@@ -61,9 +61,9 @@
/**
* Execute command.
*/
- public void execute(FtpIoSession session,
- FtpServerContext context,
- FtpRequest request) throws IOException, FtpException {
+ public void execute(final FtpIoSession session,
+ final FtpServerContext context,
+ final FtpRequest request) throws IOException, FtpException {
try {
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOU.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOU.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOU.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STOU.java Thu Jul 31 05:36:42 2008
@@ -59,9 +59,9 @@
/**
* Execute command.
*/
- public void execute(FtpIoSession session,
- FtpServerContext context,
- FtpRequest request) throws IOException, FtpException {
+ public void execute(final FtpIoSession session,
+ final FtpServerContext context,
+ final FtpRequest request) throws IOException, FtpException {
try {
// 24-10-2007 - added check if PORT or PASV is issued, see https://issues.apache.org/jira/browse/FTPSERVER-110
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STRU.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STRU.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STRU.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/STRU.java Thu Jul 31 05:36:42 2008
@@ -44,9 +44,9 @@
/**
* Execute command
*/
- public void execute(FtpIoSession session,
- FtpServerContext context,
- FtpRequest request) throws IOException {
+ public void execute(final FtpIoSession session,
+ final FtpServerContext context,
+ final FtpRequest request) throws IOException {
// reset state variables
session.resetState();
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SYST.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SYST.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SYST.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/SYST.java Thu Jul 31 05:36:42 2008
@@ -40,9 +40,9 @@
/**
* Execute command
*/
- public void execute(FtpIoSession session,
- FtpServerContext context,
- FtpRequest request) throws IOException {
+ public void execute(final FtpIoSession session,
+ final FtpServerContext context,
+ final FtpRequest request) throws IOException {
// reset state variables
session.resetState();
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/TYPE.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/TYPE.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/TYPE.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/TYPE.java Thu Jul 31 05:36:42 2008
@@ -43,9 +43,9 @@
/**
* Execute command
*/
- public void execute(FtpIoSession session,
- FtpServerContext context,
- FtpRequest request) throws IOException {
+ public void execute(final FtpIoSession session,
+ final FtpServerContext context,
+ final FtpRequest request) throws IOException {
// reset state variables
session.resetState();
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/USER.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/USER.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/USER.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/command/USER.java Thu Jul 31 05:36:42 2008
@@ -50,9 +50,9 @@
/**
* Execute command.
*/
- public void execute(FtpIoSession session,
- FtpServerContext context,
- FtpRequest request) throws IOException, FtpException {
+ public void execute(final FtpIoSession session,
+ final FtpServerContext context,
+ final FtpRequest request) throws IOException, FtpException {
boolean success = false;
ServerFtpStatistics stat = (ServerFtpStatistics)context.getFtpStatistics();
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/CommandFactoryBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/CommandFactoryBeanDefinitionParser.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/CommandFactoryBeanDefinitionParser.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/CommandFactoryBeanDefinitionParser.java Thu Jul 31 05:36:42 2008
@@ -40,7 +40,7 @@
* {@inheritDoc}
*/
@Override
- protected Class<? extends CommandFactory> getBeanClass(Element element) {
+ protected Class<? extends CommandFactory> getBeanClass(final Element element) {
return DefaultCommandFactory.class;
}
@@ -48,7 +48,7 @@
* {@inheritDoc}
*/
@Override
- protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
+ protected void doParse(final Element element, final ParserContext parserContext, final BeanDefinitionBuilder builder) {
ManagedMap commands = new ManagedMap();
List<Element> childs = SpringUtil.getChildElements(element);
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FileSystemBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FileSystemBeanDefinitionParser.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FileSystemBeanDefinitionParser.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/FileSystemBeanDefinitionParser.java Thu Jul 31 05:36:42 2008
@@ -37,7 +37,7 @@
* {@inheritDoc}
*/
@Override
- protected Class<? extends FileSystemManager> getBeanClass(Element element) {
+ protected Class<? extends FileSystemManager> getBeanClass(final Element element) {
return NativeFileSystemManager.class;
}
@@ -45,7 +45,7 @@
* {@inheritDoc}
*/
@Override
- protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
+ protected void doParse(final Element element, final ParserContext parserContext, final BeanDefinitionBuilder builder) {
if(StringUtils.hasText(element.getAttribute("case-insensitive"))) {
builder.addPropertyValue("caseInsensitive", Boolean.parseBoolean(element.getAttribute("case-insensitive")));
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ListenerBeanDefinitionParser.java Thu Jul 31 05:36:42 2008
@@ -53,7 +53,7 @@
* {@inheritDoc}
*/
@Override
- protected Class<NioListener> getBeanClass(Element element) {
+ protected Class<NioListener> getBeanClass(final Element element) {
return NioListener.class;
}
@@ -61,7 +61,7 @@
* Parse CIDR notations into MINA {@link Subnet}s.
* TODO: move to Mina
*/
- private Subnet parseSubnet(String subnet) {
+ private Subnet parseSubnet(final String subnet) {
if(subnet == null) {
throw new NullPointerException("subnet can not be null");
}
@@ -99,7 +99,7 @@
* {@inheritDoc}
*/
@Override
- protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
+ protected void doParse(final Element element, final ParserContext parserContext, final BeanDefinitionBuilder builder) {
if(StringUtils.hasText(element.getAttribute("port"))) {
builder.addPropertyValue("port", Integer.parseInt(element.getAttribute("port")));
}
@@ -139,7 +139,7 @@
}
- private SslConfiguration parseSsl(Element parent) {
+ private SslConfiguration parseSsl(final Element parent) {
Element sslElm = SpringUtil.getChildElement(parent, FtpServerNamespaceHandler.FTPSERVER_NS, "ssl");
if(sslElm != null) {
@@ -211,7 +211,7 @@
}
- private DataConnectionConfiguration parseDataConnection(Element element, SslConfiguration listenerSslConfiguration) {
+ private DataConnectionConfiguration parseDataConnection(final Element element, final SslConfiguration listenerSslConfiguration) {
DefaultDataConnectionConfiguration dc = new DefaultDataConnectionConfiguration();
if(element != null) {
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/ServerBeanDefinitionParser.java Thu Jul 31 05:36:42 2008
@@ -45,7 +45,7 @@
/**
* {@inheritDoc}
*/
- protected Class<? extends FtpServer> getBeanClass(Element element) {
+ protected Class<? extends FtpServer> getBeanClass(final Element element) {
return FtpServer.class;
}
@@ -53,7 +53,7 @@
* {@inheritDoc}
*/
@Override
- protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
+ protected void doParse(final Element element, final ParserContext parserContext, final BeanDefinitionBuilder builder) {
List<Element> childs = SpringUtil.getChildElements(element);
for(Element childElm : childs) {
String childName = childElm.getLocalName();
@@ -115,8 +115,8 @@
/**
* Parse the "messages" element
*/
- private MessageResource parseMessageResource(Element childElm, ParserContext parserContext,
- BeanDefinitionBuilder builder) {
+ private MessageResource parseMessageResource(final Element childElm, final ParserContext parserContext,
+ final BeanDefinitionBuilder builder) {
MessageResourceImpl mr = new MessageResourceImpl();
@@ -139,7 +139,7 @@
/**
* Parse the "ftplets" element
*/
- private Map parseFtplets(Element childElm, ParserContext parserContext, BeanDefinitionBuilder builder) {
+ private Map parseFtplets(final Element childElm, final ParserContext parserContext, final BeanDefinitionBuilder builder) {
ManagedMap ftplets = new ManagedMap();
List<Element> childs = SpringUtil.getChildElements(childElm);
@@ -156,7 +156,7 @@
* Parse listeners elements
*/
@SuppressWarnings("unchecked")
- private Map parseListeners(Element listenersElm, ParserContext parserContext, BeanDefinitionBuilder builder) {
+ private Map parseListeners(final Element listenersElm, final ParserContext parserContext, final BeanDefinitionBuilder builder) {
ManagedMap listeners = new ManagedMap();
List<Element> childs = SpringUtil.getChildElements(listenersElm);
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/SpringUtil.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/SpringUtil.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/SpringUtil.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/SpringUtil.java Thu Jul 31 05:36:42 2008
@@ -44,7 +44,7 @@
* @param elm The element for which to locate children
* @return All children
*/
- public static List<Element> getChildElements(Element elm) {
+ public static List<Element> getChildElements(final Element elm) {
List<Element> elements = new ArrayList<Element>();
NodeList childs = elm.getChildNodes();
for(int i = 0; i<childs.getLength(); i++) {
@@ -65,7 +65,7 @@
* @param localName The local name to match, or null for any local name
* @return The first child matching the criteria
*/
- public static Element getChildElement(Element parent, String ns, String localName) {
+ public static Element getChildElement(final Element parent, final String ns, final String localName) {
List<Element> elements = getChildElements(parent);
for(Element element : elements) {
@@ -86,7 +86,7 @@
* @return The text content of the first child matching the criteria
* or null if element not found
*/
- public static String getChildElementText(Element parent, String ns, String localName) {
+ public static String getChildElementText(final Element parent, final String ns, final String localName) {
List<Element> elements = getChildElements(parent);
for(Element element : elements) {
@@ -108,7 +108,7 @@
* @param builder The Spring bean definition builder
* @return The Spring bean definition
*/
- public static Object parseSpringChildElement(Element parent, ParserContext parserContext, BeanDefinitionBuilder builder) {
+ public static Object parseSpringChildElement(final Element parent, final ParserContext parserContext, final BeanDefinitionBuilder builder) {
Element springElm = getChildElement(parent, null, null);
String ln = springElm.getLocalName();
@@ -129,7 +129,7 @@
* @param defaultValue The default value
* @return The value, or the default value
*/
- public static boolean parseBoolean(Element parent, String attrName, boolean defaultValue) {
+ public static boolean parseBoolean(final Element parent, final String attrName, final boolean defaultValue) {
if(StringUtils.hasText(parent.getAttribute(attrName))) {
return Boolean.parseBoolean(parent.getAttribute(attrName));
}
@@ -143,7 +143,7 @@
* @return The value
* @throws NumberFormatException If the attribute does not contain a number
*/
- public static int parseInt(Element parent, String attrName) {
+ public static int parseInt(final Element parent, final String attrName) {
return Integer.parseInt(parent.getAttribute(attrName));
}
@@ -155,7 +155,7 @@
* @param defaultValue The default value
* @return The value, or the default value
*/
- public static int parseInt(Element parent, String attrName, int defaultValue) {
+ public static int parseInt(final Element parent, final String attrName, final int defaultValue) {
if(StringUtils.hasText(parent.getAttribute(attrName))) {
return Integer.parseInt(parent.getAttribute(attrName));
}
@@ -168,7 +168,7 @@
* @param attrName The attribute name
* @return The attribute string value
*/
- public static String parseString(Element parent, String attrName) {
+ public static String parseString(final Element parent, final String attrName) {
if(parent.hasAttribute(attrName)) {
return parent.getAttribute(attrName);
} else {
@@ -182,7 +182,7 @@
* @param attrName The attribute name
* @return The file representing the path used in the attribute
*/
- public static File parseFile(Element parent, String attrName) {
+ public static File parseFile(final Element parent, final String attrName) {
if(StringUtils.hasText(parent.getAttribute(attrName))) {
return new File(parent.getAttribute(attrName));
}
@@ -195,7 +195,7 @@
* @param attrName The attribute name
* @return The attribute value parsed into a {@link InetAddress}
*/
- public static InetAddress parseInetAddress(Element parent, String attrName) {
+ public static InetAddress parseInetAddress(final Element parent, final String attrName) {
if(StringUtils.hasText(parent.getAttribute(attrName))) {
try {
return InetAddress.getByName(parent.getAttribute(attrName));
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/config/spring/UserManagerBeanDefinitionParser.java Thu Jul 31 05:36:42 2008
@@ -35,7 +35,7 @@
public class UserManagerBeanDefinitionParser extends AbstractSingleBeanDefinitionParser {
@Override
- protected Class<? extends UserManager> getBeanClass(Element element) {
+ protected Class<? extends UserManager> getBeanClass(final Element element) {
if(element.getLocalName().equals("file-user-manager")) {
return PropertiesUserManager.class;
} else {
@@ -44,7 +44,7 @@
}
@Override
- protected void doParse(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) {
+ protected void doParse(final Element element, final ParserContext parserContext, final BeanDefinitionBuilder builder) {
if(getBeanClass(element) == PropertiesUserManager.class) {
builder.addPropertyValue("propFile", element.getAttribute("file"));
if(StringUtils.hasText(element.getAttribute("encrypt-passwords")) &&
@@ -80,7 +80,7 @@
}
}
- private String getSql(Element element, String elmName) {
+ private String getSql(final Element element, final String elmName) {
return SpringUtil.getChildElementText(element, FtpServerNamespaceHandler.FTPSERVER_NS, elmName);
}
}
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NameEqualsFileFilter.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NameEqualsFileFilter.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NameEqualsFileFilter.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NameEqualsFileFilter.java Thu Jul 31 05:36:42 2008
@@ -36,12 +36,12 @@
* @param nameToMatch The exact file name to match
* @param caseInsensitive Wether that match should be case insensitive
*/
- public NameEqualsFileFilter(String nameToMatch, boolean caseInsensitive) {
+ public NameEqualsFileFilter(final String nameToMatch, final boolean caseInsensitive) {
this.nameToMatch = nameToMatch;
this.caseInsensitive = caseInsensitive;
}
- public boolean accept(File file) {
+ public boolean accept(final File file) {
if(caseInsensitive) {
return file.getName().equalsIgnoreCase(nameToMatch);
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileObject.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileObject.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileObject.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/filesystem/NativeFileObject.java Thu Jul 31 05:36:42 2008
@@ -51,7 +51,7 @@
/**
* Constructor.
*/
- protected NativeFileObject(String fileName, File file, User user) {
+ protected NativeFileObject(final String fileName, final File file, final User user) {
if (fileName == null) {
throw new IllegalArgumentException("fileName can not be null");
}
@@ -222,7 +222,7 @@
/**
* Move file object.
*/
- public boolean move(FileObject dest) {
+ public boolean move(final FileObject dest) {
boolean retVal = false;
if (dest.hasWritePermission() && hasReadPermission()) {
File destFile = ((NativeFileObject) dest).file;
@@ -300,7 +300,7 @@
/**
* Create output stream for writing.
*/
- public OutputStream createOutputStream(long offset) throws IOException {
+ public OutputStream createOutputStream(final long offset) throws IOException {
// permission check
if (!hasWritePermission()) {
@@ -327,7 +327,7 @@
/**
* Create input stream for reading.
*/
- public InputStream createInputStream(long offset) throws IOException {
+ public InputStream createInputStream(final long offset) throws IOException {
// permission check
if (!hasReadPermission()) {
@@ -351,12 +351,12 @@
}
/**
- * Normalize separate characher. Separate character should be '/' always.
+ * Normalize separate character. Separate character should be '/' always.
*/
- public final static String normalizeSeparateChar(String pathName) {
- pathName = pathName.replace(File.separatorChar, '/');
- pathName = pathName.replace('\\', '/');
- return pathName;
+ public final static String normalizeSeparateChar(final String pathName) {
+ String normalizedPathName = pathName.replace(File.separatorChar, '/');
+ normalizedPathName = normalizedPathName.replace('\\', '/');
+ return normalizedPathName;
}
/**
@@ -373,42 +373,43 @@
* @return The return string will always begin with the root directory. It
* will never be null.
*/
- public final static String getPhysicalName(String rootDir, String currDir,
- String fileName) {
+ public final static String getPhysicalName(final String rootDir, final String currDir,
+ final String fileName) {
return getPhysicalName(rootDir, currDir, fileName, false);
}
- public final static String getPhysicalName(String rootDir, String currDir,
- String fileName, boolean caseInsensitive) {
+ public final static String getPhysicalName(final String rootDir, final String currDir,
+ final String fileName, final boolean caseInsensitive) {
// get the starting directory
- rootDir = normalizeSeparateChar(rootDir);
- if (rootDir.charAt(rootDir.length() - 1) != '/') {
- rootDir += '/';
+ String normalizedRootDir = normalizeSeparateChar(rootDir);
+ if (normalizedRootDir.charAt(normalizedRootDir.length() - 1) != '/') {
+ normalizedRootDir += '/';
}
- fileName = normalizeSeparateChar(fileName);
+ String normalizedFileName = normalizeSeparateChar(fileName);
String resArg;
- if (fileName.charAt(0) != '/') {
- if (currDir == null) {
- currDir = "/";
+ String normalizedCurrDir = currDir;
+ if (normalizedFileName.charAt(0) != '/') {
+ if (normalizedCurrDir == null) {
+ normalizedCurrDir = "/";
}
- if (currDir.length() == 0) {
- currDir = "/";
+ if (normalizedCurrDir.length() == 0) {
+ normalizedCurrDir = "/";
}
- currDir = normalizeSeparateChar(currDir);
+ normalizedCurrDir = normalizeSeparateChar(normalizedCurrDir);
- if (currDir.charAt(0) != '/') {
- currDir = '/' + currDir;
+ if (normalizedCurrDir.charAt(0) != '/') {
+ normalizedCurrDir = '/' + normalizedCurrDir;
}
- if (currDir.charAt(currDir.length() - 1) != '/') {
- currDir += '/';
+ if (normalizedCurrDir.charAt(normalizedCurrDir.length() - 1) != '/') {
+ normalizedCurrDir += '/';
}
- resArg = rootDir + currDir.substring(1);
+ resArg = normalizedRootDir + normalizedCurrDir.substring(1);
} else {
- resArg = rootDir;
+ resArg = normalizedRootDir;
}
// strip last '/'
@@ -418,7 +419,7 @@
// replace ., ~ and ..
// in this loop resArg will never end with '/'
- StringTokenizer st = new StringTokenizer(fileName, "/");
+ StringTokenizer st = new StringTokenizer(normalizedFileName, "/");
while (st.hasMoreTokens()) {
String tok = st.nextToken();
@@ -429,7 +430,7 @@
// .. => parent directory (if not root)
if (tok.equals("..")) {
- if (resArg.startsWith(rootDir)) {
+ if (resArg.startsWith(normalizedRootDir)) {
int slashIndex = resArg.lastIndexOf('/');
if (slashIndex != -1) {
resArg = resArg.substring(0, slashIndex);
@@ -440,7 +441,7 @@
// ~ => home directory (in this case the root directory)
if (tok.equals("~")) {
- resArg = rootDir.substring(0, rootDir.length() - 1);
+ resArg = normalizedRootDir.substring(0, normalizedRootDir.length() - 1);
continue;
}
@@ -457,13 +458,13 @@
}
// add last slash if necessary
- if ((resArg.length()) + 1 == rootDir.length()) {
+ if ((resArg.length()) + 1 == normalizedRootDir.length()) {
resArg += '/';
}
// final check
- if (!resArg.regionMatches(0, rootDir, 0, rootDir.length())) {
- resArg = rootDir;
+ if (!resArg.regionMatches(0, normalizedRootDir, 0, normalizedRootDir.length())) {
+ resArg = normalizedRootDir;
}
return resArg;
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResourceImpl.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResourceImpl.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResourceImpl.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/message/MessageResourceImpl.java Thu Jul 31 05:36:42 2008
@@ -60,11 +60,19 @@
}
public String[] getLanguages() {
- return languages;
+ if(languages != null) {
+ return languages.clone();
+ } else {
+ return null;
+ }
}
public void setLanguages(String[] languages) {
- this.languages = languages;
+ if(languages != null) {
+ this.languages = languages.clone();
+ } else {
+ this.languages = null;
+ }
}
public File getCustomMessageDirectory() {
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/DefaultSslConfiguration.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/DefaultSslConfiguration.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/DefaultSslConfiguration.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/ssl/DefaultSslConfiguration.java Thu Jul 31 05:36:42 2008
@@ -375,7 +375,11 @@
* @see SslConfiguration#getEnabledCipherSuites()
*/
public String[] getEnabledCipherSuites() {
- return enabledCipherSuites;
+ if(enabledCipherSuites != null) {
+ return enabledCipherSuites.clone();
+ } else {
+ return null;
+ }
}
/**
@@ -385,7 +389,11 @@
* @param enabledCipherSuites
*/
public void setEnabledCipherSuites(String[] enabledCipherSuites) {
- this.enabledCipherSuites = enabledCipherSuites;
+ if(enabledCipherSuites != null) {
+ this.enabledCipherSuites = enabledCipherSuites.clone();
+ } else {
+ this.enabledCipherSuites = null;
+ }
}
/**
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/BaseUser.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/BaseUser.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/BaseUser.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/BaseUser.java Thu Jul 31 05:36:42 2008
@@ -104,11 +104,19 @@
}
public Authority[] getAuthorities() {
- return authorities.clone();
+ if(authorities != null) {
+ return authorities.clone();
+ } else {
+ return null;
+ }
}
public void setAuthorities(Authority[] authorities) {
- this.authorities = authorities.clone();
+ if(authorities != null) {
+ this.authorities = authorities.clone();
+ } else {
+ this.authorities = null;
+ }
}
/**
Modified: mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/UserMetadata.java
URL: http://svn.apache.org/viewvc/mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/UserMetadata.java?rev=681357&r1=681356&r2=681357&view=diff
==============================================================================
--- mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/UserMetadata.java (original)
+++ mina/ftpserver/trunk/core/src/main/java/org/apache/ftpserver/usermanager/UserMetadata.java Thu Jul 31 05:36:42 2008
@@ -37,7 +37,11 @@
* is available (e.g. SSL not used)
*/
public Certificate[] getCertificateChain() {
- return certificateChain.clone();
+ if(certificateChain != null) {
+ return certificateChain.clone();
+ } else {
+ return null;
+ }
}
/**
@@ -46,7 +50,11 @@
* The certificate chain to set
*/
public void setCertificateChain(final Certificate[] certificateChain) {
- this.certificateChain = certificateChain.clone();
+ if(certificateChain != null) {
+ this.certificateChain = certificateChain.clone();
+ } else {
+ this.certificateChain = null;
+ }
}
/**