svn commit: r692017 - in /webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2: SandeshaModule.java workers/Sender.java

[mckierna]

Author: mckierna
Date: Thu Sep  4 06:55:57 2008
New Revision: 692017

URL: http://svn.apache.org/viewvc?rev=692017&view=rev
Log:
Ensure RMS lookups are robust and that storage managers are cleaned up

Modified:
    
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
    
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java

Modified: 
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java?rev=692017&r1=692016&r2=692017&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
 (original)
+++ 
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/SandeshaModule.java
 Thu Sep  4 06:55:57 2008
@@ -323,6 +323,17 @@
                        
                        //shutting down the storage manager.
                        storageManager.shutdown();
+                       
+                       //ensure the storage managers are nullified
+                       AxisConfiguration config = 
configurationContext.getAxisConfiguration();
+                       Parameter param = 
config.getParameter(Sandesha2Constants.INMEMORY_STORAGE_MANAGER);
+                       if(param!=null){
+                               config.removeParameter(param);
+                       }
+                       param = 
config.getParameter(Sandesha2Constants.PERMANENT_STORAGE_MANAGER);
+                       if(param!=null){
+                               config.removeParameter(param);
+                       }
                }
                
                if(log.isDebugEnabled()) log.debug("Exit: 
SandeshaModule::shutdown");

Modified: 
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java?rev=692017&r1=692016&r2=692017&view=diff
==============================================================================
--- 
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java
 (original)
+++ 
webservices/sandesha/trunk/java/modules/core/src/main/java/org/apache/sandesha2/workers/Sender.java
 Thu Sep  4 06:55:57 2008
@@ -167,6 +167,15 @@
                                        }
                                } else {
                                        rms = 
storageManager.getRMSBeanMgr().retrieve(entry.rmsKey);
+                                       if(rms==null)
+                                       {
+                                               if (log.isDebugEnabled())
+                                                       log.debug("RMS bean is 
null - checking using findUnique");
+                                           RMSBean matcher = new RMSBean();
+                                               
matcher.setInternalSequenceID(sequenceId);
+                                               matcher.setTerminated(false);
+                                               rms = 
storageManager.getRMSBeanMgr().findUnique(matcher);
+                                       }
                                }
                                if (rms != null && !rms.isTerminated() && 
!rms.isTimedOut()) {
                                        sequenceId = rms.getSequenceID();



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