inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
101643: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)
      101252: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2)
         101207: Merged DEV to V4.2-BUG-FIX (4.2.5)
            100710: MNT-13479 : Attempting to start IMAP service on port 143 from non-priveledged user fails quietly.
               - added code to throw exception if imap server fails at startup


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101692 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tatyana Valkevych
2015-04-10 20:59:49 +00:00
parent 07e2aa7066
commit 97be1b1243
1 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
source/java/org/alfresco/repo/imap/AlfrescoImapServer.java
View File

@@ -20,6 +20,8 @@ package org.alfresco.repo.imap;
import java.io.IOException;
import java.net.ServerSocket;
import java.util.Date;
import java.util.concurrent.atomic.AtomicReference;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -44,9 +46,9 @@ public class AlfrescoImapServer extends AbstractLifecycleBean
private class SecureImapServer extends ImapServer
{
public SecureImapServer(ServerSetup setup, Managers managers)
public SecureImapServer(ServerSetup setup, Managers managers, AtomicReference<Exception> serverOpeningExceptionRef)
{
super(setup, managers);
super(setup, managers,serverOpeningExceptionRef);
}
/**
@@ -97,9 +99,9 @@ public class AlfrescoImapServer extends AbstractLifecycleBean
private class DefaultImapServer extends ImapServer
{
public DefaultImapServer(ServerSetup setup, Managers managers)
public DefaultImapServer(ServerSetup setup, Managers managers, AtomicReference<Exception> serverOpeningExceptionRef)
{
super(setup, managers);
super(setup, managers, serverOpeningExceptionRef);
}
// same behavior as in overridden method, just added exception logging
@@ -240,7 +242,7 @@ public class AlfrescoImapServer extends AbstractLifecycleBean
{
return new AlfrescoImapHostManager(AlfrescoImapServer.this.imapService);
}
public UserManager getUserManager()
{
return imapUserManager;
@@ -249,9 +251,11 @@ public class AlfrescoImapServer extends AbstractLifecycleBean
if(isImapEnabled())
{
serverImpl = new DefaultImapServer(new ServerSetup(port, host, ServerSetup.PROTOCOL_IMAP), imapManagers);
AtomicReference<Exception> serverOpeningExceptionRef = new AtomicReference<Exception>();
serverImpl = new DefaultImapServer(new ServerSetup(port, host, ServerSetup.PROTOCOL_IMAP), imapManagers, serverOpeningExceptionRef);
serverImpl.startService(null);
checkForOpeningExceptions(serverOpeningExceptionRef);
if (logger.isInfoEnabled())
{
logger.info("IMAP service started on host:port " + host + ":" + this.port);
@@ -259,8 +263,11 @@ public class AlfrescoImapServer extends AbstractLifecycleBean
}
if(isImapsEnabled())
{
secureServerImpl = new SecureImapServer(new ServerSetup(securePort, host, ServerSetup.PROTOCOL_IMAPS), imapManagers);
secureServerImpl.startService(null);
AtomicReference<Exception> serverOpeningExceptionRef = new AtomicReference<Exception>();
secureServerImpl = new SecureImapServer(new ServerSetup(securePort, host, ServerSetup.PROTOCOL_IMAPS), imapManagers, serverOpeningExceptionRef);
secureServerImpl.startService(null);
checkForOpeningExceptions(serverOpeningExceptionRef);
if (logger.isInfoEnabled())
{
logger.info("IMAPS service started on host:port " + host + ":" + this.securePort );
@@ -277,6 +284,27 @@ public class AlfrescoImapServer extends AbstractLifecycleBean
}
}
public void checkForOpeningExceptions(AtomicReference<Exception> serverOpeningExceptionRef)
{
synchronized (serverOpeningExceptionRef)
{
try
{
//wait for openServerSocket() method to finish
serverOpeningExceptionRef.wait();
if (serverOpeningExceptionRef.get() != null)
{
throw new RuntimeException(serverOpeningExceptionRef.get());
}
} catch (InterruptedException e) {
if (logger.isDebugEnabled())
{
logger.debug(e.getMessage(), e);
}
}
}
}
public void shutdown()
{
if (serverImpl != null)