From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Sat, 30 Apr 2016 04:19:14 -0400
Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates
---
src/main/java/com/gitblit/client/GitblitClient.java | 49 ++++++++++++++++---------------------------------
1 files changed, 16 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/gitblit/client/GitblitClient.java b/src/main/java/com/gitblit/client/GitblitClient.java
index 66625a8..aecf81f 100644
--- a/src/main/java/com/gitblit/client/GitblitClient.java
+++ b/src/main/java/com/gitblit/client/GitblitClient.java
@@ -33,10 +33,6 @@
import com.gitblit.Constants.AuthorizationControl;
import com.gitblit.Constants.PermissionType;
import com.gitblit.Constants.RegistrantType;
-import com.gitblit.GitBlitException.ForbiddenException;
-import com.gitblit.GitBlitException.NotAllowedException;
-import com.gitblit.GitBlitException.UnauthorizedException;
-import com.gitblit.GitBlitException.UnknownRequestException;
import com.gitblit.Keys;
import com.gitblit.models.FederationModel;
import com.gitblit.models.FeedEntryModel;
@@ -119,34 +115,19 @@
refreshRepositories();
refreshSubscribedFeeds(0);
- try {
- // credentials may not have administrator access
- // or server may have disabled rpc management
- refreshUsers();
- if (protocolVersion > 1) {
- refreshTeams();
- }
- allowManagement = true;
- } catch (UnauthorizedException e) {
- } catch (ForbiddenException e) {
- } catch (NotAllowedException e) {
- } catch (UnknownRequestException e) {
- } catch (IOException e) {
- e.printStackTrace();
+ // credentials may not have administrator access
+ // or server may have disabled rpc management
+ refreshUsers();
+ if (protocolVersion > 1) {
+ refreshTeams();
}
+ allowManagement = true;
- try {
- // credentials may not have administrator access
- // or server may have disabled rpc administration
- refreshStatus();
- allowAdministration = true;
- } catch (UnauthorizedException e) {
- } catch (ForbiddenException e) {
- } catch (NotAllowedException e) {
- } catch (UnknownRequestException e) {
- } catch (IOException e) {
- e.printStackTrace();
- }
+ // credentials may not have administrator access
+ // or server may have disabled rpc administration
+ refreshStatus();
+ allowAdministration = true;
+
}
public int getProtocolVersion() {
@@ -253,9 +234,11 @@
// create list of available scripts by excluding inherited scripts
List<String> scripts = new ArrayList<String>();
- for (String script : settings.pushScripts) {
- if (!inherited.contains(script)) {
- scripts.add(script);
+ if (!ArrayUtils.isEmpty(settings.pushScripts)) {
+ for (String script : settings.pushScripts) {
+ if (!inherited.contains(script)) {
+ scripts.add(script);
+ }
}
}
return scripts;
--
Gitblit v1.9.1