Subversion Repositories SmartDukaan

Rev

Rev 30549 | Rev 30553 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 30549 Rev 30552
Line 260... Line 260...
260 
		User user = null;
 260 
		User user = null;
261 
		if (userInfo.getUserId() > -1) {
 261 
		if (userInfo.getUserId() > -1) {
262 
			user = userRepository.selectById(userInfo.getUserId());
 262 
			user = userRepository.selectById(userInfo.getUserId());
263 
			LOGGER.info("userinfo7 {}", userInfo);
 263 
			LOGGER.info("userinfo7 {}", userInfo);
264 
			String city = user.getCity();
 264 
			String city = user.getCity();
- 
 
 265 
 
- 
 
 266 
			LOGGER.info("emailtrue {}", userInfo.getEmail() == null);
- 
 
 267 
 
- 
 
 268 
			LOGGER.info("equality {}", user.getEmailId().equalsIgnoreCase(userInfo.getEmail()));
265 
			if (!(userInfo.getEmail() == null || user.getEmailId().equalsIgnoreCase(userInfo.getEmail()))) {
 269 
			if (!(userInfo.getEmail() == null || user.getEmailId().equalsIgnoreCase(userInfo.getEmail()))) {
266 
				String userName = null;
 270 
				String userName = null;
267 
				LOGGER.info("userinfo2 {}", userInfo);
 271 
				LOGGER.info("userinfo2 {}", userInfo);
268 
				if (user.getSecondryEmailId() != null && user.getSecondryEmailId().equals(userInfo.getEmail())) {
 272 
				if (user.getSecondryEmailId() != null && user.getSecondryEmailId().equals(userInfo.getEmail())) {
269 
 
 273