You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/12/03 16:28:34 UTC
svn commit: r1547432 - in /openmeetings:
branches/2.x/src/org/apache/openmeetings/cli/Admin.java
trunk/singlewebapp/src/install/java/org/apache/openmeetings/cli/Admin.java
Author: solomax
Date: Tue Dec 3 15:28:34 2013
New Revision: 1547432
URL: http://svn.apache.org/r1547432
Log:
NPE while cleanup is fixed
Modified:
openmeetings/branches/2.x/src/org/apache/openmeetings/cli/Admin.java
openmeetings/trunk/singlewebapp/src/install/java/org/apache/openmeetings/cli/Admin.java
Modified: openmeetings/branches/2.x/src/org/apache/openmeetings/cli/Admin.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/2.x/src/org/apache/openmeetings/cli/Admin.java?rev=1547432&r1=1547431&r2=1547432&view=diff
==============================================================================
--- openmeetings/branches/2.x/src/org/apache/openmeetings/cli/Admin.java (original)
+++ openmeetings/branches/2.x/src/org/apache/openmeetings/cli/Admin.java Tue Dec 3 15:28:34 2013
@@ -367,7 +367,7 @@ public class Admin {
}
long missing = 0;
for (User u : udao.getAllUsersDeleted()) {
- if (!u.getDeleted() && !new File(OmFileHelper.getUploadProfilesUserDir(u.getUser_id()), u.getPictureuri()).exists()) {
+ if (!u.getDeleted() && u.getPictureuri() != null && !new File(OmFileHelper.getUploadProfilesUserDir(u.getUser_id()), u.getPictureuri()).exists()) {
missing++;
}
}
Modified: openmeetings/trunk/singlewebapp/src/install/java/org/apache/openmeetings/cli/Admin.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/install/java/org/apache/openmeetings/cli/Admin.java?rev=1547432&r1=1547431&r2=1547432&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/install/java/org/apache/openmeetings/cli/Admin.java (original)
+++ openmeetings/trunk/singlewebapp/src/install/java/org/apache/openmeetings/cli/Admin.java Tue Dec 3 15:28:34 2013
@@ -370,7 +370,7 @@ public class Admin {
}
long missing = 0;
for (User u : udao.getAllUsersDeleted()) {
- if (!u.getDeleted() && !new File(OmFileHelper.getUploadProfilesUserDir(u.getUser_id()), u.getPictureuri()).exists()) {
+ if (!u.getDeleted() && u.getPictureuri() != null && !new File(OmFileHelper.getUploadProfilesUserDir(u.getUser_id()), u.getPictureuri()).exists()) {
missing++;
}
}