[jboss-svn-commits] JBL Code SVN: r6669 - in labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb: actions/converters listeners

[jboss-svn-commits at lists.jboss.org]

Author: estebanschifman
Date: 2006-10-06 18:46:17 -0400 (Fri, 06 Oct 2006)
New Revision: 6669

Modified:
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/FileToByteArray.java
   labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractListener.java
Log:
Clean warnings

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/FileToByteArray.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/FileToByteArray.java	2006-10-06 22:34:05 UTC (rev 6668)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/converters/FileToByteArray.java	2006-10-06 22:46:17 UTC (rev 6669)
@@ -32,10 +32,7 @@
 import org.apache.log4j.Logger;
 import org.jboss.soa.esb.actions.AbstractFileAction;
 import org.jboss.soa.esb.actions.ActionProcessingException;
-import org.jboss.soa.esb.listeners.DirectoryPoller;
-import org.jboss.soa.esb.listeners.DirectoryPoller.WorkingFile;
 import org.jboss.soa.esb.message.Message;
-import org.jboss.soa.esb.actions.ActionUtils;
 
 /**
  * File data to byte array reader {@link org.jboss.soa.esb.actions.ActionProcessor}.

Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractListener.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractListener.java	2006-10-06 22:34:05 UTC (rev 6668)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/listeners/AbstractListener.java	2006-10-06 22:46:17 UTC (rev 6669)
@@ -205,7 +205,6 @@
                         message = currentProcessor.process(message);
                     } catch (Exception e) {
                         GpListener.notifyError(listenerConfig, e, currentProcessor.getErrorNotification(message));
-                        message.getBody().remove(ActionUtils.BEFORE_ACTION);
                         throw e;
                     }
                     
@@ -215,9 +214,9 @@
                     }
                     // Notify on all processors.  May want to do this differently in the future i.e. more selectively ...
                     GpListener.notifyOK(listenerConfig, currentProcessor.getOkNotification(message));
-                    message.getBody().remove(ActionUtils.BEFORE_ACTION);
                     
                     // Setup the message for processing by the next processor...
+                    message.getBody().remove(ActionUtils.BEFORE_ACTION);
                 }
             } catch(Throwable thrown) {
                 processingError(initialObject, currentProcessor, thrown);