svn commit: r927343 - /axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java

[gatfora]

Author: gatfora
Date: Thu Mar 25 10:57:42 2010
New Revision: 927343

URL: http://svn.apache.org/viewvc?rev=927343&view=rev
Log:
Committing fix for SANDESHA2-201

Modified:

axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java

Modified: 
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java?rev=927343&r1=927342&r2=927343&view=diff
==
--- 
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java
 (original)
+++ 
axis/axis2/java/sandesha/trunk/modules/core/src/main/java/org/apache/sandesha2/util/FaultManager.java
 Thu Mar 25 10:57:42 2010
@@ -233,7 +233,7 @@ public class FaultManager {
Iterator it = sequenceAckList.iterator();
 
while (it.hasNext()) {
-   Range acknowledgementRange = (Range) it.next();
+   Range acknowledgementRange = it.next();
if (acknowledgementRange.lowerValue > 
acknowledgementRange.upperValue) {
invalidAck = true;  

// check upper isn't bigger than the highest 
out msg number
@@ -1046,7 +1046,7 @@ public class FaultManager {

Iterator iterator = 
storageManager.getSenderBeanMgr().find(target).iterator();
while (iterator.hasNext()) {
-   SenderBean tempBean = (SenderBean) iterator.next();
+   SenderBean tempBean = iterator.next();
 
if (tempBean.getMessageType() != 
Sandesha2Constants.MessageTypes.MAKE_CONNECTION_MSG &&
tempBean.getMessageType() != 
Sandesha2Constants.MessageTypes.ACK) {
@@ -1082,7 +1082,7 @@ public class FaultManager {
 // this is actually to support 
synapse. Synpase Axis Operation does not have a callBackMessageReceiver
  // synapse AxisOperation always has the synapse message 
receiver. And also to be send in the synapse
  // fault mediators we need to set the SENDING_FAULT 
property as well.
-} else if (msgReceiver != null) {
+} else if (msgReceiver != null && 
tempBean.getMessageType() == Sandesha2Constants.MessageTypes.APPLICATION) {
 try {
 //since there is no reponse we set this message as 
the fault reply
 context.getOptions().setRelationships(new 
RelatesTo[]{new RelatesTo(context.getMessageID())});

svn commit: r927352 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java

[isurues]

Author: isurues
Date: Thu Mar 25 11:35:33 2010
New Revision: 927352

URL: http://svn.apache.org/viewvc?rev=927352&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AXIS2-4417

Modified:

axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java?rev=927352&r1=927351&r2=927352&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/marshaller/impl/alt/MethodMarshallerUtils.java
 Thu Mar 25 11:35:33 2010
@@ -307,7 +307,8 @@ public class MethodMarshallerUtils {
 context.setProcessType(unmarshalByJavaType[i]);
 context.setIsxmlList(pd.isListType());
 }
-
+
+boolean consume = true;
 // Unmarshal the object into a JAXB object or JAXBElement
 if (pd.isHeader()) {
 
@@ -319,6 +320,7 @@ public class MethodMarshallerUtils {
localName,
context,
factory);
+consume = false;
 } else {
 if (totalBodyBlocks > 1) {
 // You must use this method if there are more than 
one body block
@@ -332,7 +334,7 @@ public class MethodMarshallerUtils {
 index++;
 }
 
-Element element = new 
Element(block.getBusinessObject(true), 
+Element element = new 
Element(block.getBusinessObject(consume),
   block.getQName());
 PDElement pde =
 new PDElement(pd, element, unmarshalByJavaType == null 
? null