You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2016/03/06 10:41:15 UTC
svn commit: r1733798 - in /axis/axis2/java/core/branches/1_7: ./
modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
Author: veithen
Date: Sun Mar 6 09:41:15 2016
New Revision: 1733798
URL: http://svn.apache.org/viewvc?rev=1733798&view=rev
Log:
Merge r1733773 to the 1.7 branch.
Modified:
axis/axis2/java/core/branches/1_7/ (props changed)
axis/axis2/java/core/branches/1_7/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
Propchange: axis/axis2/java/core/branches/1_7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Mar 6 09:41:15 2016
@@ -1,4 +1,4 @@
/axis/axis2/java/core/branches/1_6:1295540
/axis/axis2/java/core/branches/AXIOM-420:1334386-1336397
/axis/axis2/java/core/branches/AXIS2-4318:1230452,1295542,1324772,1327468,1329571,1332141,1335355,1335357,1340985
-/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770
+/axis/axis2/java/core/trunk:1726494,1726509,1726513,1727171,1727174,1727177,1727180,1729891,1730095,1730139,1730180,1730186,1730195,1730197,1730222,1730300,1730308,1730310,1730317,1730322,1730335,1730369,1730427,1730618,1731425,1731441,1731446,1731448,1732354,1733137,1733663,1733713,1733766,1733770,1733773
Modified: axis/axis2/java/core/branches/1_7/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_7/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java?rev=1733798&r1=1733797&r2=1733798&view=diff
==============================================================================
--- axis/axis2/java/core/branches/1_7/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java (original)
+++ axis/axis2/java/core/branches/1_7/modules/saaj/src/org/apache/axis2/saaj/SOAPElementImpl.java Sun Mar 6 09:41:15 2016
@@ -179,6 +179,9 @@ public class SOAPElementImpl<T extends O
* @see javax.xml.soap.SOAPElement#addNamespaceDeclaration(java.lang.String, java.lang.String)
*/
public SOAPElement addNamespaceDeclaration(String prefix, String uri) throws SOAPException {
+ if (uri == null) {
+ uri = "";
+ }
if (prefix == null || prefix.length() == 0) {
omTarget.declareDefaultNamespace(uri);
} else {