Author: chamikara
Date: Tue Nov 29 01:35:59 2005
New Revision: 349684
URL: http://svn.apache.org/viewcvs?rev=349684&view=rev
Log:
Removed the code in the handlers to check for RM enabled property Fixed some
bugs.
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java
webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java?rev=349684&r1=349683&r2=349684&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaInHandler.java
Tue Nov 29 01:35:59 2005
@@ -54,6 +54,8 @@
public void invoke(MessageContext msgCtx) throws AxisFault {
+ //System.out.println("In Sandesha In Handler....");
+
ConfigurationContext context = msgCtx.getSystemContext();
if (context == null)
throw new AxisFault("ConfigurationContext is null");
@@ -75,16 +77,6 @@
AxisService axisService = msgCtx.getAxisService();
if (axisService == null)
throw new AxisFault("AxisService is null");
-
- Parameter keyParam =
axisService.getParameter(Constants.RM_ENABLE_KEY);
- Object keyValue = null;
- if (keyParam != null)
- keyValue = keyParam.getValue();
-
- if (keyValue == null || !keyValue.equals("true")) {
- //RM is not enabled for the service. Quiting
SandeshaInHandler
- return;
- }
RMMsgContext rmMsgCtx = null;
try {
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java?rev=349684&r1=349683&r2=349684&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/handlers/SandeshaOutHandler.java
Tue Nov 29 01:35:59 2005
@@ -85,31 +85,8 @@
if (axisService == null)
throw new AxisFault("AxisService is null");
- if (!msgCtx.isServerSide()) {
- //getting rm message
- RMMsgContext rmMsgCtx = null;
-
- rmMsgCtx = MsgInitializer.initializeMessage(msgCtx);
-
- if (rmMsgCtx.getMessageType() ==
Constants.MessageTypes.UNKNOWN) {
- Parameter param = new
ParameterImpl(Constants.RM_ENABLE_KEY,
- "true");
- axisService.addParameter(param);
- }
- }
-
//getting rm message
RMMsgContext rmMsgCtx =
MsgInitializer.initializeMessage(msgCtx);
-
- Parameter keyParam =
axisService.getParameter(Constants.RM_ENABLE_KEY);
- Object keyValue = null;
- if (keyParam != null)
- keyValue = keyParam.getValue();
-
- if (keyValue == null || !keyValue.equals("true")) {
- //RM is not enabled for the service. Quiting
SandeshaOutHandler
- return;
- }
String DONE = (String) msgCtx
.getProperty(Constants.APPLICATION_PROCESSING_DONE);
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java?rev=349684&r1=349683&r2=349684&view=diff
==============================================================================
---
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java
(original)
+++
webservices/sandesha/trunk/src/org/apache/sandesha2/storage/inmemory/InMemorySenderBeanMgr.java
Tue Nov 29 01:35:59 2005
@@ -110,12 +110,13 @@
public Collection findMsgsToSend() {
ArrayList beans = new ArrayList();
- Iterator iterator = table.values().iterator();
+ Iterator iterator = table.keySet().iterator();
SenderBean temp;
while (iterator.hasNext()) {
- temp = (SenderBean) iterator.next();
+ Object key = iterator.next();
+ temp = (SenderBean) table.get(key);
if (temp.isSend()) {
@@ -127,79 +128,7 @@
}
}
- // beans = sort (beans);
- // beans = reverse (beans);
-
return beans;
- }
-
- private ArrayList reverse(ArrayList beans) {
- ArrayList newBeans = new ArrayList();
- int count = beans.size();
-
- for (int i = count; i > 0; i--) {
- newBeans.add(beans.get((i - 1)));
- }
-
- return newBeans;
- }
-
- //FIXME - not complete
- //SENDER SORTING
- //--------------
- //Sender Sorting is used to arrange the messages that get sent.
- //This sending order may get dsturbed due to network latencies.
- //But doing the sort here, could improve the server preformance when
- // network latencies are low (this is the common case).
- //Sender sorting will be enabled, when invocation type is InOrder.
- private ArrayList sort(ArrayList beans) {
- ArrayList newBeans = new ArrayList();
- HashMap tempHash = new HashMap();
-
- Iterator iter1 = beans.iterator();
- while (iter1.hasNext()) {
- SenderBean bean = (SenderBean) iter1.next();
- if (!(bean.getMessageNumber() > 0)) {
- newBeans.add(bean);
- }
- }
-
- Iterator iter2 = beans.iterator();
- long maxMsgNo = 0;
- long minMsgNo = 0;
- while (iter2.hasNext()) {
- SenderBean bean = (SenderBean) iter2.next();
-
- if (bean.getMessageNumber() > 0) {
- maxMsgNo = bean.getMessageNumber();
- minMsgNo = bean.getMessageNumber();
- break;
- }
- }
-
- //finding Max and Min msg numbers present in the current list.
- while (iter2.hasNext()) {
- SenderBean bean = (SenderBean) iter2.next();
- long msgNo = bean.getMessageNumber();
- if (msgNo > 0) {
- //tempHash.put(new Long
(bean.getMessageNumber()),bean);
- if (msgNo > maxMsgNo)
- maxMsgNo = msgNo;
-
- if (msgNo < minMsgNo)
- minMsgNo = msgNo;
- }
- }
-
- for (long msgNo = minMsgNo; msgNo <= maxMsgNo; msgNo++) {
- ArrayList beansOfMsgNo = findBeansWithMsgNo(beans,
msgNo);
- Iterator iter = beansOfMsgNo.iterator();
- while (iter.hasNext()) {
-
- }
- }
-
- return newBeans;
}
private ArrayList findBeansWithMsgNo(ArrayList list, long msgNo) {
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java?rev=349684&r1=349683&r2=349684&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/util/RMMsgCreator.java
Tue Nov 29 01:35:59 2005
@@ -245,8 +245,6 @@
SOAPFactory factory =
SOAPAbstractFactory.getSOAPFactory(SandeshaUtil
.getSOAPVersion(referenceMessage.getEnvelope()));
- MessageInformationHeaders newMessageInfoHeaders = new
MessageInformationHeaders();
-
terminateMessage.setMessageInformationHeaders(newMessageInfoHeaders);
terminateMessage.setMessageID(SandeshaUtil.getUUID());
ConfigurationContext configCtx =
referenceMessage.getSystemContext();
Modified:
webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java
URL:
http://svn.apache.org/viewcvs/webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java?rev=349684&r1=349683&r2=349684&view=diff
==============================================================================
--- webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java
(original)
+++ webservices/sandesha/trunk/src/org/apache/sandesha2/workers/Sender.java Tue
Nov 29 01:35:59 2005
@@ -111,7 +111,6 @@
}
try {
-
System.out.println("Sending message:" +
SandeshaUtil.getMessageTypeString(rmMsgCtx.getMessageType()));
new
AxisEngine(context).send(msgCtx);
} catch (Exception e) {
//Exception is sending.
retry later
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
