From 3286926d2ec11445f76cd170e4c2fcff597a0754 Mon Sep 17 00:00:00 2001
From: Fabrice Bacchella <fbacchella@spamcop.net>
Date: Tue, 26 May 2015 04:48:40 -0400
Subject: [PATCH] Two slight improvement for custom UserService: - try userRealm as a file only if class is not found, other exeptions are real error - log userService only after setup, for better logging, as it can use gitblit.properties for custom .toString
---
src/main/java/com/gitblit/utils/ArrayUtils.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/gitblit/utils/ArrayUtils.java b/src/main/java/com/gitblit/utils/ArrayUtils.java
index 8387ef7..1402ad5 100644
--- a/src/main/java/com/gitblit/utils/ArrayUtils.java
+++ b/src/main/java/com/gitblit/utils/ArrayUtils.java
@@ -16,6 +16,7 @@
package com.gitblit.utils;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.List;
@@ -71,4 +72,20 @@
}
return list;
}
+
+ public static <X> List<X> join(List<X>... elements) {
+ List<X> list = new ArrayList<X>();
+ for (List<X> element : elements) {
+ list.addAll(element);
+ }
+ return list;
+ }
+
+ public static <X> List<X> join(X[]... elements) {
+ List<X> list = new ArrayList<X>();
+ for (X[] element : elements) {
+ list.addAll(Arrays.asList(element));
+ }
+ return list;
+ }
}
--
Gitblit v1.9.1