directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1005750 - /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java
Date Fri, 08 Oct 2010 09:44:59 GMT
Author: pamarcelot
Date: Fri Oct  8 09:44:58 2010
New Revision: 1005750

URL: http://svn.apache.org/viewvc?rev=1005750&view=rev
Log:
Brought back the nullity test.

Modified:
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java?rev=1005750&r1=1005749&r2=1005750&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java
(original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java
Fri Oct  8 09:44:58 2010
@@ -80,7 +80,7 @@ public class LdapResultDsml implements D
         // Matched DN
         DN matchedDN = result.getMatchedDn();
 
-        if ( !DN.EMPTY_DN.equals( matchedDN ) )
+        if ( ( matchedDN != null ) && ( !DN.EMPTY_DN.equals( matchedDN ) ) )
         {
             root.addAttribute( "matchedDN", matchedDN.getName() );
         }



Mime
View raw message