Commit @50fbec1ed9ea41e8f0e4d2507d592683ad0f649d

Sangcheol Hwang 2013-01-18

fix out of memory error at travis

@50fbec1ed9ea41e8f0e4d2507d592683ad0f649d

e826049

50fbec1

.travis.yml

--- .travis.yml

+++ .travis.yml

...	...	@@ -4,4 +4,4 @@
4	4	before_script:
5	5	- wget http://download.playframework.org/releases/play-${PLAY_VERSION}.zip
6	6	- unzip -q play-${PLAY_VERSION}.zip
7		-script: play-${PLAY_VERSION}/play test
	7	+script: play-${PLAY_VERSION}/play test -Dxmx=512

e826049

50fbec1

app/controllers/ProjectApp.java

--- app/controllers/ProjectApp.java

+++ app/controllers/ProjectApp.java


         return ok(projectHome.render("title.projectHome",
                 getProject(userName, projectName)));
     }
-
+    
+    @Cached(key = "newProjectForm")
     public static Result newProjectForm() {
         if (session().get(UserApp.SESSION_USERID) == null) {
             flash(Constants.WARNING, "user.login.alert");

e826049

50fbec1

app/controllers/UserApp.java

--- app/controllers/UserApp.java

+++ app/controllers/UserApp.java


 
 	public static User anonymous = new User();
 
-//	@Cached(key = "loginForm")
+	@Cached(key = "loginForm")
 	public static Result loginForm() {
 		return ok(login.render("title.login", form(User.class)));
 	}
 
 	public static Result logout() {
 		session().clear();
-		response().discardCookies(TOKEN);
+		response().discardCookie(TOKEN);
 
 		flash(Constants.SUCCESS, "user.logout.success");
 		return redirect(routes.Application.index());
 	}
 
-//	@Cached(key = "login")
 	public static Result login() {
 		Form<User> userForm = form(User.class).bindFromRequest();
 		if(userForm.hasErrors()) {

 		Logger.debug("remember me enabled");
 	}
 
+	@Cached(key="signupForm")
 	public static Result signupForm() {
 		return ok(signup.render("title.signup", form(User.class)));
 	}

Add a comment

Open 0
Closed 0

List

...	...	@@ -46,20 +46,19 @@
46	46
47	47	public static User anonymous = new User();
48	48
49		-// @Cached(key = "loginForm")
	49	+ @Cached(key = "loginForm")
50	50	public static Result loginForm() {
51	51	return ok(login.render("title.login", form(User.class)));
52	52	}
53	53
54	54	public static Result logout() {
55	55	session().clear();
56		- response().discardCookies(TOKEN);
	56	+ response().discardCookie(TOKEN);
57	57
58	58	flash(Constants.SUCCESS, "user.logout.success");
59	59	return redirect(routes.Application.index());
60	60	}
61	61
62		-// @Cached(key = "login")
63	62	public static Result login() {
64	63	Form<User> userForm = form(User.class).bindFromRequest();
65	64	if(userForm.hasErrors()) {
...	...	@@ -156,6 +155,7 @@
156	155	Logger.debug("remember me enabled");
157	156	}
158	157
	158	+ @Cached(key="signupForm")
159	159	public static Result signupForm() {
160	160	return ok(signup.render("title.signup", form(User.class)));
161	161	}

...	...	@@ -49,7 +49,8 @@
49	49	return ok(projectHome.render("title.projectHome",
50	50	getProject(userName, projectName)));
51	51	}
52		-
	52	+
	53	+ @Cached(key = "newProjectForm")
53	54	public static Result newProjectForm() {
54	55	if (session().get(UserApp.SESSION_USERID) == null) {
55	56	flash(Constants.WARNING, "user.login.alert");

Delete comment