[jboss-svn-commits] JBL Code SVN: r23643 - in labs/jbossesb/workspace/skeagh/routing/file/src: test/java/org/jboss/esb/file and 1 other directory.

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

Author: beve
Date: 2008-10-31 04:08:59 -0400 (Fri, 31 Oct 2008)
New Revision: 23643

Modified:
   labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/FileInboundRouter.java
   labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/FileInboundRouterTest.java
Log:
Updated the check for null messages.


Modified: labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/FileInboundRouter.java
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/FileInboundRouter.java	2008-10-31 07:45:16 UTC (rev 23642)
+++ labs/jbossesb/workspace/skeagh/routing/file/src/main/java/org/jboss/esb/file/FileInboundRouter.java	2008-10-31 08:08:59 UTC (rev 23643)
@@ -240,10 +240,11 @@
         logger.info(" schedule triggered...");
         System.out.println(" schedule triggered...");
         final InvocationContext invocationContext = new InvocationContext();
+        final Message message = createEsbMessage(invocationContext);
 
-        final Message message = createEsbMessage(invocationContext);
-        if (message == null)
+        if (message != null)
         {
+
             final FileLifecycle fileLifecycle = getFileLifeCycle(invocationContext);
             try
             {
@@ -256,6 +257,7 @@
                 throw new SchedulingException(e.getMessage(), e);
             }
         }
+
         //onProcessingComplete(message, fileLifecycle);
     }
 

Modified: labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/FileInboundRouterTest.java
===================================================================
--- labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/FileInboundRouterTest.java	2008-10-31 07:45:16 UTC (rev 23642)
+++ labs/jbossesb/workspace/skeagh/routing/file/src/test/java/org/jboss/esb/file/FileInboundRouterTest.java	2008-10-31 08:08:59 UTC (rev 23643)
@@ -42,6 +42,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;