You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sc...@apache.org on 2006/07/14 23:32:30 UTC
svn commit: r422061 - in
/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl:
BlockFactoryImpl.java XMLSpineImpl.java
Author: scheu
Date: Fri Jul 14 14:32:29 2006
New Revision: 422061
URL: http://svn.apache.org/viewvc?rev=422061&view=rev
Log:
JIRA Issue AXIS2-889
Contributor Nick Gallardo
Modified:
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/BlockFactoryImpl.java
webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/BlockFactoryImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/BlockFactoryImpl.java?rev=422061&r1=422060&r2=422061&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/BlockFactoryImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/BlockFactoryImpl.java Fri Jul 14 14:32:29 2006
@@ -42,9 +42,15 @@
public Block createFrom(Block other, Object context) throws XMLStreamException, MessageException {
// This is the default behavior. Derived Factories may
// provide a more performant implementation.
- if (other.getBlockFactory().equals(this) &&
- other.getBusinessContext().equals(context)) {
- return other;
+ if (other.getBlockFactory().equals(this)) {
+ if (other.getBusinessContext() == null &&
+ context == null) {
+ return other;
+ }
+ else if (other.getBusinessContext() != null &&
+ other.getBusinessContext().equals(context)) {
+ return other;
+ }
}
QName qName= null;
if (other.isQNameAvailable()) {
Modified: webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java?rev=422061&r1=422060&r2=422061&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java (original)
+++ webservices/axis2/trunk/java/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/XMLSpineImpl.java Fri Jul 14 14:32:29 2006
@@ -236,7 +236,7 @@
Block oldBlock = bodyBlocks.get(index);
// Convert to new Block
- Block newBlock = blockFactory.createFrom(oldBlock, blockFactory);
+ Block newBlock = blockFactory.createFrom(oldBlock, context);
if (newBlock != oldBlock) {
bodyBlocks.set(index, newBlock);
}
@@ -270,7 +270,7 @@
Block oldBlock = bodyBlocks.get(index);
// Convert to new Block
- Block newBlock = blockFactory.createFrom(oldBlock, blockFactory);
+ Block newBlock = blockFactory.createFrom(oldBlock, context);
if (newBlock != oldBlock) {
headerBlocks.set(index, newBlock);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org