ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1576787 - /webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLUtil.java
Date Wed, 12 Mar 2014 15:40:23 GMT
Author: coheigea
Date: Wed Mar 12 15:40:22 2014
New Revision: 1576787

URL: http://svn.apache.org/r1576787
Log:
Prevent possible NPE

Modified:
    webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLUtil.java

Modified: webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLUtil.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLUtil.java?rev=1576787&r1=1576786&r2=1576787&view=diff
==============================================================================
--- webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLUtil.java
(original)
+++ webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLUtil.java
Wed Mar 12 15:40:22 2014
@@ -165,7 +165,7 @@ public final class OpenSAMLUtil {
             }
         } finally {
             if (frag != null) {
-                if (doc.getDocumentElement() != null
+                if (doc.getDocumentElement() != null && element != null
                     && doc.getDocumentElement() != element) {
                     doc.getDocumentElement().removeChild(element);
                 }



Mime
View raw message