You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by er...@apache.org on 2007/07/18 04:51:27 UTC

svn commit: r557121 - /directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/GetPrincipalStoreEntry.java

Author: erodriguez
Date: Tue Jul 17 19:51:26 2007
New Revision: 557121

URL: http://svn.apache.org/viewvc?view=rev&rev=557121
Log:
Improved Kerberos error message:  Error now differentiates between non-existent principal or existing principal but with no key(s).

Modified:
    directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/GetPrincipalStoreEntry.java

Modified: directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/GetPrincipalStoreEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/GetPrincipalStoreEntry.java?view=diff&rev=557121&r1=557120&r2=557121
==============================================================================
--- directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/GetPrincipalStoreEntry.java (original)
+++ directory/apacheds/trunk/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/service/GetPrincipalStoreEntry.java Tue Jul 17 19:51:26 2007
@@ -62,9 +62,14 @@
             throw new KerberosException( errorType, e );
         }
 
-        if ( entry == null || entry.getKeyMap().isEmpty() )
+        if ( entry == null )
         {
             throw new KerberosException( errorType );
+        }
+
+        if ( entry.getKeyMap() == null || entry.getKeyMap().isEmpty() )
+        {
+            throw new KerberosException( ErrorType.KDC_ERR_NULL_KEY );
         }
 
         return entry;