Author: bbrossaud Date: 2010-07-15 10:03:27 +0200 (Thu, 15 Jul 2010) New Revision: 82 Url: http://chorem.org/repositories/revision/bow/82 Log: the empty alias addition in the bookmark form works Modified: trunk/pom.xml trunk/src/main/java/org/chorem/bow/ControllerServlet.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-14 13:25:12 UTC (rev 81) +++ trunk/pom.xml 2010-07-15 08:03:27 UTC (rev 82) @@ -219,8 +219,18 @@ </dependencies> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> </plugins> </build> </project> + Modified: trunk/src/main/java/org/chorem/bow/ControllerServlet.java =================================================================== --- trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-14 13:25:12 UTC (rev 81) +++ trunk/src/main/java/org/chorem/bow/ControllerServlet.java 2010-07-15 08:03:27 UTC (rev 82) @@ -535,9 +535,11 @@ Bookmark bookmark = null; if (name != null) { String tags = request.getParameter("tags"); // tags - Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_ALIAS, alias).criteria(); - if (proxy.findByCriteria(Bookmark.class, criteria) != null) { - alias = ""; + if (alias != null && !alias.isEmpty()) { + Criteria criteria = Search.query().eq(Bookmark.FQ_FIELD_ALIAS, alias).criteria(); + if (proxy.findByCriteria(Bookmark.class, criteria) != null) { + alias = ""; + } } bookmark = BookmarkActions.createBookmark(link, name, tags, user, alias, null); } else { // this part is for the bookmark addition by script