svn commit: r1542375 - /manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java

[kwright]

Author: kwright
Date: Fri Nov 15 19:25:27 2013
New Revision: 1542375

URL: http://svn.apache.org/r1542375
Log:
Map to specific registered provider name.

Modified:
    
manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java

Modified: 
manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
URL: 
http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java?rev=1542375&r1=1542374&r2=1542375&view=diff
==============================================================================
--- 
manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
 (original)
+++ 
manifoldcf/branches/CONNECTORS-553/connectors/email/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/email/EmailConnector.java
 Fri Nov 15 19:25:27 2013
@@ -80,7 +80,13 @@ public class EmailConnector extends org.
   private Folder folder;
   private Store store;
 
-
+  private static Map<String,String> providerMap;
+  static
+  {
+    providerMap = new HashMap<String,String>();
+    providerMap.put(EmailConfig.PROTOCOL_POP3, 
EmailConfig.PROTOCOL_POP3_PROVIDER);
+    providerMap.put(EmailConfig.PROTOCOL_IMAP, 
EmailConfig.PROTOCOL_IMAP_PROVIDER);
+  }
   //////////////////////////////////Start of Basic Connector 
Methods/////////////////////////
 
   /**
@@ -159,7 +165,7 @@ public class EmailConnector extends org.
   protected void checkConnection() throws ManifoldCFException, 
ServiceInterruption {
     while (true) {
       try {
-        store = getSession().getStore(protocol);
+        store = getSession().getStore(providerMap.get(protocol));
         store.connect(server, username, password);
         Folder defaultFolder = store.getDefaultFolder();
         if (defaultFolder == null) {
@@ -351,10 +357,10 @@ public class EmailConnector extends org.
   }
 
   private void initializeConnection() throws MessagingException {
-    store = getSession().getStore(protocol);
+    store = getSession().getStore(providerMap.get(protocol));
     store.connect(server, username, password);
 
-    if (protocol == EmailConfig.PROTOCOL_IMAP_PROVIDER) {
+    if (protocol.equals(EmailConfig.PROTOCOL_IMAP)) {
       folder = store.getFolder(folderName);
     } else {
       folder = store.getFolder(EmailConfig.FOLDER_INBOX);