luetaan sitä koodia

code/moya-web/src/main/java/fi/codecrew/moya/web/cdiview/shop/InviteAcceptView.java

@@ -104,9 +104,9 @@ public class InviteAcceptView extends GenericCDIView {
 			super.addFaceMessage("invite.userCreateSuccessfull");
 			super.addFaceMessage("invite.userCreateSuccessfull");
 
 
 			if(isPlaceGroupMembership())
 			if(isPlaceGroupMembership())
-				return "/place/myGroups.jsf";
+				return "/place/myGroups";
 			else
 			else
-				return "/index.jsf";
+				return "/index";
 		}
 		}
 		this.username = null;
 		this.username = null;
 		this.password = null;
 		this.password = null;
@@ -117,27 +117,21 @@ public class InviteAcceptView extends GenericCDIView {
 
 
 	private void login(String usr, String pwd) {
 	private void login(String usr, String pwd) {
 		HttpServletRequest req = getRequest();
 		HttpServletRequest req = getRequest();
-		String existingUsername = null;
 
 
 		if (req.getUserPrincipal() != null) {
 		if (req.getUserPrincipal() != null) {
-			if (req.getUserPrincipal() != null) {
-				try {
-					req.logout();
-				} catch (ServletException e) {
-					logger.warn("Logging out previous user failed!", e);
-				}
-			} else {
-				existingUsername = req.getUserPrincipal().getName();
-			}
-		}
-
-		if (existingUsername == null) {
 			try {
 			try {
-				req.login(usr.trim().toLowerCase(), pwd);
+				req.logout();
 			} catch (ServletException e) {
 			} catch (ServletException e) {
-				logger.warn("Login failed for invite user " + usr, e);
+				logger.warn("Logging out previous user failed!", e);
 			}
 			}
 		}
 		}
+
+		try {
+			req.login(usr.trim().toLowerCase(), pwd);
+		} catch (ServletException e) {
+			logger.warn("Login failed for invite user " + usr, e);
+		}
+
 	}
 	}
 
 
 	public String createUser() {
 	public String createUser() {
@@ -151,9 +145,9 @@ public class InviteAcceptView extends GenericCDIView {
 			user = null;
 			user = null;
 
 
 			if(isPlaceGroupMembership())
 			if(isPlaceGroupMembership())
-				return "/place/myGroups.jsf";
+				return "/place/myGroups";
 			else
 			else
-				return "/index.jsf";
+				return "/index";
 
 
 		}
 		}
 		super.addFaceMessage("invite.userCreateSuccessfull");
 		super.addFaceMessage("invite.userCreateSuccessfull");