svn commit: r1531488 - in /openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web: pages/auth/ForgetPasswordDialog.java util/ContactsHelper.java

[solomax]

Author: solomax
Date: Sat Oct 12 02:52:37 2013
New Revision: 1531488

URL: http://svn.apache.org/r1531488
Log:
[OPENMEETINGS-816] ManageCryptStyle is not bean and should be accessed in 
static way

Modified:
    
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
    
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/ContactsHelper.java

Modified: 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1531488&r1=1531487&r2=1531488&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
 Sat Oct 12 02:52:37 2013
@@ -227,8 +227,7 @@ public class ForgetPasswordDialog extend
        private void sendHashByUser(User us, String appLink, AdminUserDao 
userDao) throws Exception {
                String loginData = us.getLogin() + new Date();
                log.debug("User: " + us.getLogin());
-               
us.setResethash(getBean(ManageCryptStyle.class).getInstanceOfCrypt().createPassPhrase(
-                               loginData));
+               
us.setResethash(ManageCryptStyle.getInstanceOfCrypt().createPassPhrase(loginData));
                userDao.update(us, -1L);
                String reset_link = appLink + "?hash=" + us.getResethash();
 

Modified: 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/ContactsHelper.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/ContactsHelper.java?rev=1531488&r1=1531487&r2=1531488&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/ContactsHelper.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/util/ContactsHelper.java
 Sat Oct 12 02:52:37 2013
@@ -43,7 +43,7 @@ public class ContactsHelper {
                if (countContacts != null && countContacts > 0) {
                        return -45L;
                }
-               String hash = 
getBean(ManageCryptStyle.class).getInstanceOfCrypt()
+               String hash = ManageCryptStyle.getInstanceOfCrypt()
                        
.createPassPhrase(CalendarPatterns.getDateWithTimeByMiliSeconds(new Date()));
 
                Long userContactId = 
getBean(UserContactsDao.class).addUserContact(userIdToAdd, getUserId(), true, 
hash);