You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@jspwiki.apache.org by aj...@apache.org on 2008/10/13 15:49:00 UTC

svn commit: r704121 - /incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java

Author: ajaquith
Date: Mon Oct 13 06:49:00 2008
New Revision: 704121

URL: http://svn.apache.org/viewvc?rev=704121&view=rev
Log:
Merged STRIPES_BRANCH with trunk revision 703235.

Modified:
    incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java

Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java?rev=704121&r1=704120&r2=704121&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/src/com/ecyrd/jspwiki/auth/user/XMLUserDatabase.java Mon Oct 13 06:49:00 2008
@@ -611,6 +611,9 @@
         checkForRefresh();
         
         NodeList users = c_dom.getElementsByTagName( USER_TAG );
+        
+        if( users == null ) return null;
+        
         for( int i = 0; i < users.getLength(); i++ )
         {
             Element user = (Element) users.item( i );