svn commit: r690171 - /ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java

[jonesde]

Author: jonesde
Date: Fri Aug 29 03:22:56 2008
New Revision: 690171

URL: http://svn.apache.org/viewvc?rev=690171&view=rev
Log:
Fixed missing eli.close reported by Hans Bakker on the mailing list; also cleaned up some poorly formatted and superfluous code

Modified:
    ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java

Modified: ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java?rev=690171&r1=690170&r2=690171&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java (original)
+++ ofbiz/trunk/framework/common/src/org/ofbiz/common/login/LoginServices.java Fri Aug 29 03:22:56 2008
@@ -380,30 +380,31 @@
             //No valid value is found so don't bother to save any password history
             passwordChangeHistoryLimit = 0;
         }
-        if(passwordChangeHistoryLimit == 0 || passwordChangeHistoryLimit < 0){
+        if (passwordChangeHistoryLimit == 0 || passwordChangeHistoryLimit < 0){
             // Not saving password history, so return from here.
             return;
         }
-        List<EntityCondition> exprs = FastList.newInstance();
+        
         EntityFindOptions efo = new EntityFindOptions();
         efo.setResultSetType(EntityFindOptions.TYPE_SCROLL_INSENSITIVE);
-        exprs.add(EntityCondition.makeConditionMap("userLoginId", userLoginId));
-        EntityListIterator eli = delegator.find("UserLoginPasswordHistory", EntityCondition.makeCondition(exprs), null, null, UtilMisc.toList("-fromDate"), efo);
+        EntityListIterator eli = delegator.find("UserLoginPasswordHistory", EntityCondition.makeConditionMap("userLoginId", userLoginId), null, null, UtilMisc.toList("-fromDate"), efo);
         Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
         GenericValue pwdHist;
-        if((pwdHist = eli.next()) !=null){
+        if ((pwdHist = eli.next()) != null){
             // updating password so set end date on previous password in history
             pwdHist.set("thruDate", nowTimestamp);
             pwdHist.store();
             // check if we have hit the limit on number of password changes to be saved. If we did then delete the oldest password from history.
             eli.last();
             int rowIndex = eli.currentIndex();
-            if(rowIndex==passwordChangeHistoryLimit){
+            if (rowIndex==passwordChangeHistoryLimit){
                 eli.afterLast();
                 pwdHist = eli.previous();
                 pwdHist.remove();
             }
         }
+        eli.close();
+        
         // save this password in history        
         GenericValue userLoginPwdHistToCreate = delegator.makeValue("UserLoginPasswordHistory", UtilMisc.toMap("userLoginId", userLoginId,"fromDate", nowTimestamp));
         boolean useEncryption = "true".equals(UtilProperties.getPropertyValue("security.properties", "password.encrypt"));