Author: dims
Date: Wed Mar 12 11:37:08 2008
New Revision: 636444
URL: http://svn.apache.org/viewvc?rev=636444&view=rev
Log:
Fix for AXIS2-3369 - NullPointerException in
org.apache.axiom.om.impl.util.OMSerializerUtil
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java
URL:
http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java?rev=636444&r1=636443&r2=636444&view=diff
==============================================================================
---
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java
(original)
+++
webservices/commons/trunk/modules/axiom/modules/axiom-api/src/main/java/org/apache/axiom/om/impl/util/OMSerializerUtil.java
Wed Mar 12 11:37:08 2008
@@ -632,8 +632,11 @@
// It is possible that the namespace is associated with multiple
prefixes,
// So try getting the namespace as a second step.
if (writerPrefix != null) {
- String writerNS =
writer.getNamespaceContext().getNamespaceURI(prefix);
- return namespace.equals(writerNS);
+ NamespaceContext nsContext = writer.getNamespaceContext();
+ if(nsContext != null) {
+ String writerNS = nsContext.getNamespaceURI(prefix);
+ return namespace.equals(writerNS);
+ }
}
return false;
} else {
@@ -664,9 +667,12 @@
// Fallback to using the namespace context
- String writerNS = writer.getNamespaceContext().getNamespaceURI("");
- if (writerNS != null && writerNS.length() > 0) {
- return false;
+ NamespaceContext nsContext = writer.getNamespaceContext();
+ if (nsContext != null) {
+ String writerNS = nsContext.getNamespaceURI("");
+ if (writerNS != null && writerNS.length() > 0) {
+ return false;
+ }
}
return true;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
