[Babeldoc-devel] babeldoc/modules/scanner/src/com/babeldoc/scanner/worker MailboxScanner.java,1.27,1.28

[<de...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/worker
In directory sc8-pr-cvs1:/tmp/cvs-serv9019/modules/scanner/src/com/babeldoc/scanner/worker

Modified Files:
	MailboxScanner.java 
Log Message:
Fixed few bugs that can occur if connection unsuccessfull

Index: MailboxScanner.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/scanner/src/com/babeldoc/scanner/worker/MailboxScanner.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** MailboxScanner.java	1 Oct 2003 12:23:42 -0000	1.27
--- MailboxScanner.java	3 Oct 2003 13:05:45 -0000	1.28
***************
*** 60,64 ****
   *
   * $Header$
!  * $DateTime$
   * $Author$
   *
--- 60,64 ----
   *
   * $Header$
!  * $Date$
   * $Author$
   *
***************
*** 98,102 ****
   *
   * @author Bruce McDonald, Dejan Krsmanovic
!  * @version 1.0
   */
  public class MailboxScanner extends ScannerWorker {
--- 98,102 ----
   *
   * @author Bruce McDonald, Dejan Krsmanovic
!  * @version $Revision$
   */
  public class MailboxScanner extends ScannerWorker {
***************
*** 148,163 ****
  			Properties props = new Properties();
  			session = Session.getInstance(props, null);		
! 			store = session.getStore(protocol);			
  			store.connect(host, username, password);			
  			folder = store.getFolder(folder_);
  			folder.open(Folder.READ_WRITE);
- 			
  			Message[] messages = folder.getMessages();
- 
  			for (int i = 0; i < messages.length; i++) {
  				processMessage(messages[i]);
  				deleteMessage(messages[i]);
! 			}
! 		} catch (Exception x) {
  			throw new ScannerException(
  							I18n.get("scanner.MailboxScanner.error.scanning"),
--- 148,161 ----
  			Properties props = new Properties();
  			session = Session.getInstance(props, null);		
! 			store = session.getStore(protocol);
  			store.connect(host, username, password);			
  			folder = store.getFolder(folder_);
  			folder.open(Folder.READ_WRITE);
  			Message[] messages = folder.getMessages();
  			for (int i = 0; i < messages.length; i++) {
  				processMessage(messages[i]);
  				deleteMessage(messages[i]);
! 			}			
! 		} catch (Exception x) {			
  			throw new ScannerException(
  							I18n.get("scanner.MailboxScanner.error.scanning"),
***************
*** 165,172 ****
  		} finally {
  			try {
! 				if (folder.isOpen()) {
  					folder.close(true);
  				}
! 				store.close();
  			} catch (Exception e) {
  				getLog().logError("Error closing store and folder", e);
--- 163,172 ----
  		} finally {
  			try {
! 				if (folder != null && folder.isOpen()) {
  					folder.close(true);
  				}
! 				if (store != null) {
! 					store.close();
! 				}					
  			} catch (Exception e) {
  				getLog().logError("Error closing store and folder", e);
***************
*** 327,331 ****
  				//TODO: This should be done more clever then this
  				attrs.put("contentType", "text/plain");
! 
  				//feed document
  				this.enqueue(data, attrs);
--- 327,331 ----
  				//TODO: This should be done more clever then this
  				attrs.put("contentType", "text/plain");
! 				attrs.put(ScannerWorker.FILE_NAME_KEY, originalMessage.getSubject());
  				//feed document
  				this.enqueue(data, attrs);
***************
*** 335,338 ****
--- 335,339 ----
  			if (getFrom.equalsIgnoreCase(ATTACHMENT)) {
  				StringBuffer message = getMailContent(part);
+ 				attrs.put(ScannerWorker.FILE_NAME_KEY, part.getFileName());
  				this.enqueue(message.toString().getBytes(), attrs);
  			}