vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-26 07:44:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Check for more period.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2013-03-24 19:15:37 -03:00
parent 04d58533cf
commit a60f001f2c
2 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
View File

@ -22,7 +22,9 @@ import com.wisemapping.model.Collaboration;
import com.wisemapping.model.Collaborator; import com.wisemapping.model.Collaborator;
import com.wisemapping.model.User; import com.wisemapping.model.User;
import com.wisemapping.model.AccessAuditory; import com.wisemapping.model.AccessAuditory;
import org.hibernate.ObjectNotFoundException;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport; import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
import org.springframework.security.authentication.encoding.PasswordEncoder; import org.springframework.security.authentication.encoding.PasswordEncoder;
//import org.acegisecurity.providers.encoding.PasswordEncoder; //import org.acegisecurity.providers.encoding.PasswordEncoder;
@ -69,8 +71,15 @@ public class UserManagerImpl
return cola; return cola;
} }
@Nullable
public User getUserBy(long id) { public User getUserBy(long id) {
return getHibernateTemplate().get(User.class, id); User user = null;
try{
user = getHibernateTemplate().get(User.class, id);
} catch (ObjectNotFoundException e){
// Ignore ...
}
return user;
} }
@Override @Override

10
wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java
View File

@ -135,7 +135,6 @@ public class AdminController extends BaseController {
for (int i = minUid; i < maxUid; i++) { for (int i = minUid; i < maxUid; i++) {
System.out.println("Looking for user:" + i); System.out.println("Looking for user:" + i);
try {
final User user = userService.getUserBy(i); final User user = userService.getUserBy(i);
if (user != null) { if (user != null) {
// Do not process admin accounts ... // Do not process admin accounts ...
@ -150,7 +149,7 @@ public class AdminController extends BaseController {
if (MindmapFilter.MY_MAPS.accept(mindmap, user)) { if (MindmapFilter.MY_MAPS.accept(mindmap, user)) {
final Calendar yearAgo = Calendar.getInstance(); final Calendar yearAgo = Calendar.getInstance();
yearAgo.add(Calendar.MONTH, -18); yearAgo.add(Calendar.MONTH, -8);
// The use has only two maps... When they have been modified .. // The use has only two maps... When they have been modified ..
System.out.println("Checking map id:" + mindmap.getId()); System.out.println("Checking map id:" + mindmap.getId());
if (mindmap.getLastModificationTime().before(yearAgo) && !mindmap.isPublic()) { if (mindmap.getLastModificationTime().before(yearAgo) && !mindmap.isPublic()) {
@ -166,13 +165,6 @@ public class AdminController extends BaseController {
} }
} }
} }
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
} catch (WiseMappingException e) {
e.printStackTrace();
} catch (RuntimeException e) {
e.printStackTrace();
}
} }