Author: chamikara
Date: Thu Sep  7 07:49:24 2006
New Revision: 441102

URL: http://svn.apache.org/viewvc?view=rev&rev=441102
Log:

A bug fix in the sender and invoker.


Modified:
    
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java
    webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Sender.java

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java?view=diff&rev=441102&r1=441101&r2=441102
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java 
(original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Invoker.java 
Thu Sep  7 07:49:24 2006
@@ -258,8 +258,6 @@
                                                continue;
                                        }
                                        
-                                       lock.addWork(workId);
-                                       
                                        InvokerBean bean = (InvokerBean) 
stMapIt.next();
                                        String messageContextKey = 
bean.getMessageContextRefKey();
                                        
@@ -272,6 +270,10 @@
                                        worker.setWorkId(workId);
                                        
                                        threadPool.execute(worker);
+                                       
+                                       //adding the workId to the lock after 
assigning it to a thread makes sure 
+                                       //that all the workIds in the Lock are 
handled by threads.
+                                       lock.addWork(workId);
                                }
 
                        } catch (Exception e) {

Modified: 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Sender.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Sender.java?view=diff&rev=441102&r1=441101&r2=441102
==============================================================================
--- 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Sender.java 
(original)
+++ 
webservices/sandesha/trunk/java/src/org/apache/sandesha2/workers/Sender.java 
Thu Sep  7 07:49:24 2006
@@ -189,8 +189,6 @@
                                        log.debug(message);
                                        continue;
                                }
-       
-                               lock.addWork(workId);
                                
                                transaction.commit();
                                
@@ -199,6 +197,10 @@
                                worker.setLock (lock);
                                worker.setWorkId(messageId);
                                threadPool.execute(worker);
+                               
+                               //adding the workId to the lock after assigning 
it to a thread makes sure 
+                               //that all the workIds in the Lock are handled 
by threads.
+                               lock.addWork(workId);
 
                        } catch (Exception e) {
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to