[Jaffa-svn] SF.net SVN: jaffa:[6226] branches/JAFFA_5_13_RELEASE/JaffaSOA/source/java/ org/jaffa/soa/services/SOAEventPoller.java

[<b_c...@us...>]

Revision: 6226
          http://jaffa.svn.sourceforge.net/jaffa/?rev=6226&view=rev
Author:   b_calderwood
Date:     2012-06-06 20:46:11 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
Fix how soa events are retrieved when the local id is an empty string.

Modified Paths:
--------------
    branches/JAFFA_5_13_RELEASE/JaffaSOA/source/java/org/jaffa/soa/services/SOAEventPoller.java

Modified: branches/JAFFA_5_13_RELEASE/JaffaSOA/source/java/org/jaffa/soa/services/SOAEventPoller.java
===================================================================
--- branches/JAFFA_5_13_RELEASE/JaffaSOA/source/java/org/jaffa/soa/services/SOAEventPoller.java	2012-06-05 22:13:49 UTC (rev 6225)
+++ branches/JAFFA_5_13_RELEASE/JaffaSOA/source/java/org/jaffa/soa/services/SOAEventPoller.java	2012-06-06 20:46:11 UTC (rev 6226)
@@ -67,7 +67,7 @@
  * This class polls the J_SOA_EVENTS table for new records.
  * Whenever a new record is picked up, a SOAEventQueueMessage payload is sent
  * to the Messaging system, and the record is then cleaned up.
- * 
+ *
  * @author GautamJ
  */
 @XmlRootElement
@@ -101,10 +101,10 @@
     protected void customizeCriteria(Criteria criteria) throws FrameworkException, ApplicationExceptions, ApplicationException {
         String localId = (String) ContextManagerFactory.instance().getProperty(LOCAL_ID);
         criteria.setTable(SOAEventMeta.getName());
-        if (localId != null) {
+        if (localId != null && localId.length() > 0) {
             criteria.addCriteria(SOAEventMeta.LOCAL_ID, localId);
         } else {
-        	criteria.addCriteria(SOAEventMeta.LOCAL_ID, Criteria.RELATIONAL_IS_NULL);
+            criteria.addCriteria(SOAEventMeta.LOCAL_ID, Criteria.RELATIONAL_IS_NULL);
         }
         criteria.addOrderBy(SOAEventMeta.CREATED_ON);
         criteria.addOrderBy(SOAEventMeta.EVENT_ID);
@@ -157,24 +157,20 @@
         domain.getUOW().delete(domain);
     }
 
-    
+
     /**
      * Returns the scheduleTaskId. If one hasn't been set it will return the one from the MDC context
      * @return scheduleTaskId
      */
-	public String getScheduleTaskId() {
-		return scheduleTaskId !=null ? scheduleTaskId : (String)MDC.get(BusinessEventLogMeta.SCHEDULED_TASK_ID);
-	}
+    public String getScheduleTaskId() {
+        return scheduleTaskId !=null ? scheduleTaskId : (String)MDC.get(BusinessEventLogMeta.SCHEDULED_TASK_ID);
+    }
 
-	/**
-	 * Sets the scheduleTaskId
-	 * @param scheduleTaskId
-	 */
-	public void setScheduleTaskId(String scheduleTaskId) {
-		this.scheduleTaskId = scheduleTaskId;
-	}
-    
-    
-    
-    
+    /**
+     * Sets the scheduleTaskId
+     * @param scheduleTaskId
+     */
+    public void setScheduleTaskId(String scheduleTaskId) {
+        this.scheduleTaskId = scheduleTaskId;
+    }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.