You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2011/10/27 00:07:31 UTC
svn commit: r1189500 - in
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse:
config/xml/OMElementUtils.java mediators/Value.java
Author: veithen
Date: Wed Oct 26 22:07:31 2011
New Revision: 1189500
URL: http://svn.apache.org/viewvc?rev=1189500&view=rev
Log:
Simplified and/or fixed some code using the feature introduced by AXIOM-388.
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OMElementUtils.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Value.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OMElementUtils.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OMElementUtils.java?rev=1189500&r1=1189499&r2=1189500&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OMElementUtils.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/OMElementUtils.java Wed Oct 26 22:07:31 2011
@@ -20,7 +20,6 @@
package org.apache.synapse.config.xml;
import org.apache.axiom.om.OMContainer;
-import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.commons.logging.Log;
@@ -89,37 +88,23 @@ public class OMElementUtils {
* @param log
*/
public static void addNameSpaces(XPath xpath, OMElement elem, Log log) {
+ Iterator it = elem.getNamespacesInScope();
+ while (it.hasNext()) {
- OMElement currentElem = elem;
-
- while (currentElem != null) {
- Iterator it = currentElem.getAllDeclaredNamespaces();
- while (it.hasNext()) {
-
- OMNamespace n = (OMNamespace) it.next();
- // Exclude the default namespace as explained in the Javadoc above
- if (n != null && !"".equals(n.getPrefix())) {
-
- try {
- xpath.addNamespace(n.getPrefix(), n.getNamespaceURI());
- } catch (JaxenException je) {
- String msg = "Error adding declared name space with prefix : "
- + n.getPrefix() + "and uri : " + n.getNamespaceURI()
- + " to the XPath : " + xpath;
- log.error(msg);
- throw new SynapseException(msg, je);
- }
+ OMNamespace n = (OMNamespace) it.next();
+ // Exclude the default namespace as explained in the Javadoc above
+ if (n.getPrefix().length() > 0) {
+
+ try {
+ xpath.addNamespace(n.getPrefix(), n.getNamespaceURI());
+ } catch (JaxenException je) {
+ String msg = "Error adding declared name space with prefix : "
+ + n.getPrefix() + "and uri : " + n.getNamespaceURI()
+ + " to the XPath : " + xpath;
+ log.error(msg);
+ throw new SynapseException(msg, je);
}
}
-
- OMContainer parent = currentElem.getParent();
- //if the parent is a document element or parent is null ,then return
- if (parent == null || parent instanceof OMDocument) {
- return;
- }
- if (parent instanceof OMElement) {
- currentElem = (OMElement) parent;
- }
}
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Value.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Value.java?rev=1189500&r1=1189499&r2=1189500&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Value.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/Value.java Wed Oct 26 22:07:31 2011
@@ -155,7 +155,7 @@ public class Value {
}
public void setNamespaces(OMElement elem){
- Iterator namespaces = elem.getAllDeclaredNamespaces();
+ Iterator namespaces = elem.getNamespacesInScope();
while (namespaces.hasNext()){
OMNamespace ns = (OMNamespace) namespaces.next();
namespaceList.add(ns);