Author: asankha
Date: Fri Jan 11 01:37:28 2008
New Revision: 611124
URL: http://svn.apache.org/viewvc?rev=611124&view=rev
Log:
fix NPE for aggregator and fix final revisions to prepare for RC
Modified:
webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/mediators/eip/EIPUtils.java
webservices/synapse/branches/1.1.1/pom.xml
Modified:
webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/mediators/eip/EIPUtils.java
URL:
http://svn.apache.org/viewvc/webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/mediators/eip/EIPUtils.java?rev=611124&r1=611123&r2=611124&view=diff
==============================================================================
---
webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/mediators/eip/EIPUtils.java
(original)
+++
webservices/synapse/branches/1.1.1/modules/core/src/main/java/org/apache/synapse/mediators/eip/EIPUtils.java
Fri Jan 11 01:37:28 2008
@@ -100,21 +100,26 @@
public static void enrichEnvelope(SOAPEnvelope envelope, SOAPEnvelope
enricher,
AXIOMXPath expression) throws JaxenException {
OMElement enrichingElement;
- Object o = getMatchingElements(envelope, expression).get(0);
- if (o instanceof OMElement && ((OMElement) o).getParent() instanceof
OMElement) {
- enrichingElement = (OMElement) ((OMElement) o).getParent();
- } else {
- enrichingElement = envelope.getBody();
- }
+ Object o = getMatchingElements(envelope, expression);
+ if (o != null && o instanceof List && !((List) o).isEmpty()) {
+ o = ((List) o).get(0);
- Iterator itr = getMatchingElements(enricher, expression).iterator();
- while (itr.hasNext()) {
- o = itr.next();
- if (o != null && o instanceof OMElement) {
- enrichingElement.addChild((OMElement) o);
+ if (o instanceof OMElement && ((OMElement) o).getParent()
instanceof OMElement) {
+ enrichingElement = (OMElement) ((OMElement) o).getParent();
+ } else {
+ enrichingElement = envelope.getBody();
}
- }
- }
-
+ List list = getMatchingElements(enricher, expression);
+ if (list != null) {
+ Iterator itr = list.iterator();
+ while (itr.hasNext()) {
+ o = itr.next();
+ if (o != null && o instanceof OMElement) {
+ enrichingElement.addChild((OMElement) o);
+ }
+ }
+ }
+ }
+ }
}
Modified: webservices/synapse/branches/1.1.1/pom.xml
URL:
http://svn.apache.org/viewvc/webservices/synapse/branches/1.1.1/pom.xml?rev=611124&r1=611123&r2=611124&view=diff
==============================================================================
--- webservices/synapse/branches/1.1.1/pom.xml (original)
+++ webservices/synapse/branches/1.1.1/pom.xml Fri Jan 11 01:37:28 2008
@@ -1061,7 +1061,7 @@
<!-- Axis2 1.2 and its dependencies -->
<axis2.version>1.3</axis2.version>
- <axis2-clustering.version>SNAPSHOT</axis2-clustering.version>
+ <axis2-clustering.version>610782</axis2-clustering.version>
<axiom.version>1.2.5</axiom.version>
<xml_schema.version>1.3.2-591227</xml_schema.version>
<xml_apis.version>1.3.03</xml_apis.version>
@@ -1103,8 +1103,8 @@
<!-- dependencies of Synapse extensions module -->
<wso2commons.version>1.2</wso2commons.version>
- <wso2caching.version>SNAPSHOT</wso2caching.version>
- <wso2throttle.version>SNAPSHOT</wso2throttle.version>
+ <wso2caching.version>1.6</wso2caching.version>
+ <wso2throttle.version>1.6</wso2throttle.version>
<spring.version>1.2.8</spring.version>
<xbean.version>2.2.0</xbean.version>
<bsf.version>3.0-beta2</bsf.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
