Author: coheigea
Date: Fri Jun 13 13:44:30 2014
New Revision: 1602426
URL: http://svn.apache.org/r1602426
Log:
Some minor fixes
Modified:
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPUtils.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecHeader.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/CustomTokenOutputProcessor.java
Modified:
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPUtils.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPUtils.java?rev=1602426&r1=1602425&r2=1602426&view=diff
==============================================================================
---
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPUtils.java
(original)
+++
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/SPUtils.java
Fri Jun 13 13:44:30 2014
@@ -27,7 +27,6 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
public class SPUtils {
@@ -36,15 +35,14 @@ public class SPUtils {
}
public static boolean hasChildElements(Element element) {
- NodeList nodeList = element.getChildNodes();
- int elementCount = 0;
- for (int i = 0; i < nodeList.getLength(); i++) {
- Node node = nodeList.item(i);
- if (node.getNodeType() == Node.ELEMENT_NODE) {
- elementCount++;
+ Node firstChild = element.getFirstChild();
+ while (firstChild != null) {
+ if (firstChild.getNodeType() == Node.ELEMENT_NODE) {
+ return true;
}
+ firstChild = firstChild.getNextSibling();
}
- return elementCount > 0;
+ return false;
}
public static Element getFirstPolicyChildElement(Element element) {
@@ -200,9 +198,10 @@ public class SPUtils {
xmlStreamWriter.writeNamespace(element.getPrefix(),
element.getNamespaceURI());
}
}
- NodeList childNodes = element.getChildNodes();
- for (int i = 0; i < childNodes.getLength(); i++) {
- serialize(childNodes.item(i), xmlStreamWriter);
+ Node firstChild = element.getFirstChild();
+ while (firstChild != null) {
+ serialize(firstChild, xmlStreamWriter);
+ firstChild = firstChild.getNextSibling();
}
xmlStreamWriter.writeEndElement();
} else if (node.getNodeType() == Node.TEXT_NODE) {
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecHeader.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecHeader.java?rev=1602426&r1=1602425&r2=1602426&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecHeader.java
(original)
+++
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecHeader.java
Fri Jun 13 13:44:30 2014
@@ -108,7 +108,7 @@ public class WSSecHeader {
);
}
- if (securityHeader == null ||
securityHeader.getChildNodes().getLength() == 0) {
+ if (securityHeader == null || securityHeader.getFirstChild() == null) {
return true;
}
return false;
Modified:
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/CustomTokenOutputProcessor.java
URL:
http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/CustomTokenOutputProcessor.java?rev=1602426&r1=1602425&r2=1602426&view=diff
==============================================================================
---
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/CustomTokenOutputProcessor.java
(original)
+++
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/CustomTokenOutputProcessor.java
Fri Jun 13 13:44:30 2014
@@ -39,7 +39,6 @@ import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
public class CustomTokenOutputProcessor extends AbstractOutputProcessor {
@@ -133,17 +132,17 @@ public class CustomTokenOutputProcessor
QName elementName = new QName(element.getNamespaceURI(),
element.getLocalName(), element.getPrefix());
createStartElementAndOutputAsEvent(outputProcessorChain,
elementName, namespaces, attributes);
- NodeList childNodes = element.getChildNodes();
- for (int i = 0; i < childNodes.getLength(); i++) {
- Node childNode = childNodes.item(i);
- switch (childNode.getNodeType()) {
+ Node firstChild = element.getFirstChild();
+ while (firstChild != null) {
+ switch (firstChild.getNodeType()) {
case Node.ELEMENT_NODE:
- outputToken((Element) childNode, outputProcessorChain);
+ outputToken((Element) firstChild,
outputProcessorChain);
break;
case Node.TEXT_NODE:
- createCharactersAndOutputAsEvent(outputProcessorChain,
((Text) childNode).getData());
+ createCharactersAndOutputAsEvent(outputProcessorChain,
((Text) firstChild).getData());
break;
}
+ firstChild = firstChild.getNextSibling();
}
createEndElementAndOutputAsEvent(outputProcessorChain,
elementName);
}
