svn commit: r391662 - /webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/util/OMSerializerUtil.java

[ruchithf]

Author: ruchithf
Date: Wed Apr  5 09:07:08 2006
New Revision: 391662

URL: http://svn.apache.org/viewcvs?rev=391662&view=rev
Log:
Watch out for NPEs - this also fixes theEchoRawSWATest in axis2

Modified:
    
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/util/OMSerializerUtil.java

Modified: 
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/util/OMSerializerUtil.java
URL: 
http://svn.apache.org/viewcvs/webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/util/OMSerializerUtil.java?rev=391662&r1=391661&r2=391662&view=diff
==============================================================================
--- 
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/util/OMSerializerUtil.java
 (original)
+++ 
webservices/commons/trunk/modules/axiom/src/org/apache/axiom/om/impl/util/OMSerializerUtil.java
 Wed Apr  5 09:07:08 2006
@@ -92,9 +92,8 @@
         String uri = namespace.getName();
         String prefix = namespace.getPrefix();
 
-        String prefixFromWriter = writer.getPrefix(uri);
-
         if (uri != null && !"".equals(uri)) {
+            String prefixFromWriter = writer.getPrefix(uri);
             // lets see whether we have default namespace now
             if (prefix != null && "".equals(prefix) && prefixFromWriter == 
null) {
                 // this has not been declared earlier
@@ -124,9 +123,9 @@
         String prefix;
         if (element.getNamespace() != null) {
             nameSpaceName = element.getNamespace().getName();
-            writer_prefix = writer.getPrefix(nameSpaceName);
             prefix = element.getNamespace().getPrefix();
             if (nameSpaceName != null) {
+                writer_prefix = writer.getPrefix(nameSpaceName);
                 if (writer_prefix != null) {
                     writer.writeStartElement(nameSpaceName,
                             element.getLocalName());