Start a transaction before calling into auth service during login. Fix for AR-1183.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gary Spencer
2007-01-24 12:03:46 +00:00
parent 363533b921
commit 363bb82299

View File

@@ -18,7 +18,6 @@ package org.alfresco.filesys.ftp;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.Writer; import java.io.Writer;
@@ -59,7 +58,6 @@ import org.alfresco.filesys.server.filesys.SrvDiskInfo;
import org.alfresco.filesys.server.filesys.TreeConnection; import org.alfresco.filesys.server.filesys.TreeConnection;
import org.alfresco.filesys.server.filesys.TreeConnectionHash; import org.alfresco.filesys.server.filesys.TreeConnectionHash;
import org.alfresco.filesys.smb.server.repo.ContentContext; import org.alfresco.filesys.smb.server.repo.ContentContext;
import org.alfresco.filesys.util.HexDump;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationComponent; import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
@@ -185,8 +183,6 @@ public class FTPSrvSession extends SrvSession implements Runnable
private InputStream m_in; private InputStream m_in;
private byte[] m_inbuf; private byte[] m_inbuf;
// private InputStreamReader m_in;
// private char[] m_inbuf;
private OutputStreamWriter m_out; private OutputStreamWriter m_out;
private StringBuffer m_outbuf; private StringBuffer m_outbuf;
@@ -888,6 +884,10 @@ public class FTPSrvSession extends SrvSession implements Runnable
cInfo.setPassword(req.getArgument()); cInfo.setPassword(req.getArgument());
// Start a transaction
beginReadTransaction( getServer().getConfiguration().getTransactionService());
// Use the normal authentication service as we have the plaintext password // Use the normal authentication service as we have the plaintext password
AuthenticationService authService = getServer().getConfiguration().getAuthenticationService(); AuthenticationService authService = getServer().getConfiguration().getAuthenticationService();