[xwiki-notifications] r7211 - in xwiki-platform/core/trunk/xwiki-core/src: main/java/com/xpn/xwiki/api main/java/com/xpn/xwiki/user/api test/java/com/xpn/xwiki/api

[SVN]

Author: sdumitriu
Date: 2008-01-31 09:42:08 +0100 (Thu, 31 Jan 2008)
New Revision: 7211

Modified:
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/User.java
   
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/user/api/XWikiUser.java
   
xwiki-platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/api/UserTest.java
Log:
XWIKI-2040: api.User#isUserInGroup should not throw exceptions
Fixed another NPE introduced by the previous changes.


Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/User.java
===================================================================
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/User.java  
    2008-01-31 01:55:04 UTC (rev 7210)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/api/User.java  
    2008-01-31 08:42:08 UTC (rev 7211)
@@ -83,7 +83,7 @@
             return user.isUserInGroup(groupName, getXWikiContext());
         } catch (Exception ex) {
             LOG.warn(new MessageFormat("Unhandled exception checking if user 
{0}"
-                + " belongs to group {1}").format(new String[] 
{user.getUser(), groupName}), ex);
+                + " belongs to group {1}").format(new java.lang.Object[] 
{user, groupName}), ex);
         }
         return false;
     }

Modified: 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/user/api/XWikiUser.java
===================================================================
--- 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/user/api/XWikiUser.java
    2008-01-31 01:55:04 UTC (rev 7210)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/main/java/com/xpn/xwiki/user/api/XWikiUser.java
    2008-01-31 08:42:08 UTC (rev 7211)
@@ -84,4 +84,9 @@
     {
         this.main = main;
     }
+    
+    public String toString()
+    {
+        return getUser();
+    }
 }

Modified: 
xwiki-platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/api/UserTest.java
===================================================================
--- 
xwiki-platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/api/UserTest.java
  2008-01-31 01:55:04 UTC (rev 7210)
+++ 
xwiki-platform/core/trunk/xwiki-core/src/test/java/com/xpn/xwiki/api/UserTest.java
  2008-01-31 08:42:08 UTC (rev 7211)
@@ -17,8 +17,11 @@
      */
     public void testIsUserInGroupDoesNotThrowNPE()
     {
+        User u = new User(null, null);
+        assertFalse(u.isUserInGroup("XWiki.InexistentGroupName"));
+
         XWikiUser xu = new XWikiUser(null);
-        User u = new User(xu, null);
+        u = new User(xu, null);
         assertFalse(u.isUserInGroup("XWiki.InexistentGroupName"));
 
         XWikiContext c = new XWikiContext();

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications