diff options
| author | James Moger <james.moger@gitblit.com> | 2012-01-05 17:08:44 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-01-05 17:08:44 -0500 |
| commit | 0db5c4710b27969a8e1e49a752c541f5e0bb0a32 (patch) | |
| tree | bf9f38f4fd058344bc0db918d2252345341c9ff3 /src/com/gitblit/FileUserService.java | |
| parent | 5e8e7ed191aaf72811334b4ba656405932719766 (diff) | |
| download | gitblit-0db5c4710b27969a8e1e49a752c541f5e0bb0a32.tar.gz gitblit-0db5c4710b27969a8e1e49a752c541f5e0bb0a32.zip | |
Using ArrayUtils.isEmpty to test arrays and collections
Diffstat (limited to 'src/com/gitblit/FileUserService.java')
| -rw-r--r-- | src/com/gitblit/FileUserService.java | 49 |
1 files changed, 30 insertions, 19 deletions
diff --git a/src/com/gitblit/FileUserService.java b/src/com/gitblit/FileUserService.java index 9c4e507d..37ca9a70 100644 --- a/src/com/gitblit/FileUserService.java +++ b/src/com/gitblit/FileUserService.java @@ -33,6 +33,7 @@ import org.slf4j.LoggerFactory; import com.gitblit.models.TeamModel;
import com.gitblit.models.UserModel;
+import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.DeepCopier;
import com.gitblit.utils.StringUtils;
@@ -868,29 +869,39 @@ public class FileUserService extends FileSettings implements IUserService { private void updateTeamCache(Properties allUsers, String teamname, TeamModel model) {
StringBuilder sb = new StringBuilder();
- for (String repository : model.repositories) {
- sb.append(repository);
- sb.append(',');
+ if (!ArrayUtils.isEmpty(model.repositories)) {
+ for (String repository : model.repositories) {
+ sb.append(repository);
+ sb.append(',');
+ }
}
- for (String user : model.users) {
- sb.append('!');
- sb.append(user);
- sb.append(',');
+ if (!ArrayUtils.isEmpty(model.users)) {
+ for (String user : model.users) {
+ sb.append('!');
+ sb.append(user);
+ sb.append(',');
+ }
}
- for (String address : model.mailingLists) {
- sb.append('&');
- sb.append(address);
- sb.append(',');
+ if (!ArrayUtils.isEmpty(model.mailingLists)) {
+ for (String address : model.mailingLists) {
+ sb.append('&');
+ sb.append(address);
+ sb.append(',');
+ }
}
- for (String script : model.preReceiveScripts) {
- sb.append('^');
- sb.append(script);
- sb.append(',');
+ if (!ArrayUtils.isEmpty(model.preReceiveScripts)) {
+ for (String script : model.preReceiveScripts) {
+ sb.append('^');
+ sb.append(script);
+ sb.append(',');
+ }
}
- for (String script : model.postReceiveScripts) {
- sb.append('%');
- sb.append(script);
- sb.append(',');
+ if (!ArrayUtils.isEmpty(model.postReceiveScripts)) {
+ for (String script : model.postReceiveScripts) {
+ sb.append('%');
+ sb.append(script);
+ sb.append(',');
+ }
}
// trim trailing comma
sb.setLength(sb.length() - 1);
|