Scarab commit: svn commit: r10196 - branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java

Author: dabbous
Date: 2006-07-03 12:42:02-0700
New Revision: 10196

Modified:
   branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java

Log:
fixed SCB1749:
In ScarabUserImpl.java: Now if user is not set, the method isPasswordExpoired returns false.
This has to be checked in more depth later (in trunk)!

Modified: branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java
Url: http://scarab.tigris.org/source/browse/scarab/branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java?view=diff&rev=10196&p1=branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java&p2=branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java&r1=10195&r2=10196
==============================================================================
--- branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java	(original)
+++ branches/release/b21/src/java/org/tigris/scarab/om/ScarabUserImpl.java	2006-07-03 12:42:02-0700
@@ -796,7 +796,7 @@
         final Integer userid = getUserId();
         if (userid == null)
         {
-            throw new ScarabException (L10NKeySet.ExceptionGeneral,"Userid cannot be null"); //EXCEPTION
+            return false; // throw new ScarabException (L10NKeySet.ExceptionGeneral,"Userid cannot be null"); //EXCEPTION
         }
         final Criteria crit = new Criteria();
         crit.add(UserPreferencePeer.USER_ID, userid);
@@ -816,7 +816,8 @@
     {
         boolean brdo = false;
         String anonymous = Turbine.getConfiguration().getString("scarab.anonymous.username", null);
-        if (anonymous != null && getUserName().equals(anonymous))
+        String username = getUserName();
+        if (anonymous != null && username.equals(anonymous))
         {
             brdo = true;
         }