Author: ruchithf
Date: Sat Oct 13 00:14:57 2007
New Revision: 584382
URL: http://svn.apache.org/viewvc?rev=584382&view=rev
Log:
Added an NPE check
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java?rev=584382&r1=584381&r2=584382&view=diff
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
Sat Oct 13 00:14:57 2007
@@ -18,6 +18,7 @@
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPHeader;
import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
@@ -87,8 +88,12 @@
ValidatorData data = new ValidatorData(rmd);
- ArrayList headerBlocks = rmd.getMsgContext().getEnvelope()
- .getHeader().getHeaderBlocksWithNSURI(WSConstants.WSSE_NS);
+ SOAPHeader header =
rmd.getMsgContext().getEnvelope().getHeader();
+ if(header == null) {
+ throw new RampartException("missingSOAPHeader");
+ }
+
+ ArrayList headerBlocks =
header.getHeaderBlocksWithNSURI(WSConstants.WSSE_NS);
SOAPHeaderBlock secHeader = null;
//Issue is axiom - a returned collection must not be null
if(headerBlocks != null) {
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties?rev=584382&r1=584381&r2=584382&view=diff
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
Sat Oct 13 00:14:57 2007
@@ -64,6 +64,7 @@
missingEncryptedKeyInRequest=There was no EncryptedKey in the request message
rampartConigMissing = Please include configured RampartConfiguration assertion
in policy
missingSecurityHeader = Missing wsse:Security header in request
+missingSOAPHeader = SOAP header missing
#Errors in processors
errorProcessingUT = Error in processing UsernameToken
