Revision 41:590907a9667a

View differences:

src/main/java/my/com/upass/MinimalConstants.java
42 42
	public static final int ERR_APP_SERV_NOT_PERMITTED = 10;
43 43
	public static final int ERR_SYSTEM_NOT_READY = 98;
44 44
	public static final int ERR_ALREADY_EXIST = 11;
45
	public static final int ERR_LDAP = 80;
45 46
	/**
46 47
	 * defaultDateFormat = "dd-MM-yyyy HH:mm:ss";
47 48
	 */
src/main/java/my/com/upass/services/ChangeStaticPasswordService.java
103 103
					rc = MinimalConstants.ERR_SYSTEM_NOT_READY;
104 104
				}
105 105
				
106
				session.getTransaction().commit();
107
				
108 106
				//update ldap
109 107
				Config cfg = Config.getInstance();
110 108
				if("Y".equals(cfg.get(MinimalConstants.PROP_MIGRATION_PERIOD_FLAG).toString())){
......
112 110
					attrMap.put(MaybankLdapConstant.ATTR_PASSWORD, newPassword);
113 111
					MinimalUPassControllerV2.getMaybankLdapDAO().updateUser(userBean.getUserAlias(), attrMap);
114 112
				}
113

  
114
				session.getTransaction().commit();
115 115
				
116 116
			} catch (UPassException e) {
117 117
				rc = e.getErrorCode();
src/main/java/my/com/upass/services/ModifyUserService.java
11 11

  
12 12
package my.com.upass.services;
13 13

  
14
import java.util.HashMap;
14 15
import java.util.List;
16
import java.util.Map;
15 17

  
18
import my.com.upass.Config;
16 19
import my.com.upass.MinimalConstants;
17 20
import my.com.upass.MinimalUPassControllerV2;
18 21
import my.com.upass.UPassException;
......
22 25
import my.com.upass.maybank.entities.UserProfile;
23 26
import my.com.upass.pojo.MinimalUserBean;
24 27
import my.com.upass.spassword.PasswordController;
28
import my.com.upass.spring.ldap.MaybankLdapConstant;
29
import net.penril.generic.hibernate.GenericDAOHibernate;
30
import net.penril.generic.hibernate.HibernateUtils;
25 31

  
26 32
import org.hibernate.Session;
27 33

  
......
80 86
			ub.setUserType(userType);
81 87
			ub.setUstate(userState);
82 88

  
83
			if (userDao.updateUserToStore(ub, null)) {
84
				rc = MinimalConstants.ERR_SUCCESS;
89
			Session session = null;
90
			try {
91
				session = HibernateUtils.currentSession();
92
				session.beginTransaction();
93
				
94
				if (userDao.updateUserToStore(ub, session)) {
95
					rc = MinimalConstants.ERR_SUCCESS;
96
				} else {
97
					rc = MinimalConstants.ERR_UNKNOWN;
98
				}
99
				
100
				//update ldap
101
				Config cfg = Config.getInstance();
102
				if("Y".equals(cfg.get(MinimalConstants.PROP_MIGRATION_PERIOD_FLAG).toString())){
103
					Map attrMap = new HashMap();
104
					attrMap.put(MaybankLdapConstant.ATTR_PASSWORD, userPassword);
105
					MinimalUPassControllerV2.getMaybankLdapDAO().updateUser(userAlias, attrMap);
106
				}
85 107

  
86
			} else {
87
				rc = MinimalConstants.ERR_UNKNOWN;
108
				session.getTransaction().commit();
109
				
110
			} catch (UPassException e) {
111
				rc = e.getErrorCode();
112
				GenericDAOHibernate.rollbackTransactionIfAny(session);
113
			} finally { 
114
				GenericDAOHibernate.closeSessionIfAny(session);
88 115
			}
116
			
89 117
		} catch (Exception e) {
90 118
			e.printStackTrace();
91 119
		}
src/main/java/my/com/upass/spring/ldap/MaybankLdapDAOImpl.java
67 67
			ldapTemplate.modifyAttributes(context);
68 68
		} catch (NamingException e) {
69 69
			logger.warn("LDAP Error code:"+LdapStatusCodeParser.getCode(e.getExplanation()) + " - " + e.getExplanation());
70
			throw new UPassException(MinimalConstants.ERR_APP_SERV_NOT_PERMITTED);
70
			throw new UPassException(MinimalConstants.ERR_LDAP);
71 71
		}
72 72
	}
73 73
	

Also available in: Unified diff