From ed9717d4e8d36bdc37a48bb0bdf8a000a1362127 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 30 Sep 2013 10:10:46 -0400
Subject: [PATCH] Remove issue artifacts from classes missed in previous purge

---
 src/main/java/com/gitblit/GitBlit.java |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 95da669..c5304b4 100644
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -947,8 +947,8 @@
 							user.username, httpRequest.getRemoteAddr()));
 					return user;
 				} else {
-					logger.warn(MessageFormat.format("Failed login attempt for {0}, invalid credentials ({1}) from {2}", 
-							username, credentials, httpRequest.getRemoteAddr()));
+					logger.warn(MessageFormat.format("Failed login attempt for {0}, invalid credentials from {1}", 
+							username, httpRequest.getRemoteAddr()));
 				}
 			}
 		}
@@ -2008,7 +2008,7 @@
 			model.incrementalPushTagPrefix = getConfig(config, "incrementalPushTagPrefix", null);
 			model.allowForks = getConfig(config, "allowForks", true);
 			model.accessRestriction = AccessRestrictionType.fromName(getConfig(config,
-					"accessRestriction", settings.getString(Keys.git.defaultAccessRestriction, null)));
+					"accessRestriction", settings.getString(Keys.git.defaultAccessRestriction, "PUSH")));
 			model.authorizationControl = AuthorizationControl.fromName(getConfig(config,
 					"authorizationControl", settings.getString(Keys.git.defaultAuthorizationControl, null)));
 			model.verifyCommitter = getConfig(config, "verifyCommitter", false);
@@ -2534,15 +2534,15 @@
 				}
 			}
 
+			// Adjust permissions in case we updated the config files
+			JGitUtils.adjustSharedPerm(new File(r.getDirectory().getAbsolutePath(), "config"),
+					getString(Keys.git.createRepositoriesShared, "FALSE"));
+			JGitUtils.adjustSharedPerm(new File(r.getDirectory().getAbsolutePath(), "HEAD"),
+					getString(Keys.git.createRepositoriesShared, "FALSE"));
+
 			// close the repository object
 			r.close();
 		}
-
-		// Adjust permissions in case we updated the config files
-		JGitUtils.adjustSharedPerm(new File(r.getDirectory().getAbsolutePath(), "config"),
-				getString(Keys.git.createRepositoriesShared, "FALSE"));
-		JGitUtils.adjustSharedPerm(new File(r.getDirectory().getAbsolutePath(), "HEAD"),
-				getString(Keys.git.createRepositoriesShared, "FALSE"));
 
 		// update repository cache
 		removeFromCachedRepositoryList(repositoryName);

--
Gitblit v1.9.1