diff options
| author | James Moger <james.moger@gitblit.com> | 2011-10-20 08:01:54 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2011-10-20 08:01:54 -0400 |
| commit | 5ae0b71e1e6e73e4bacf321a7d5be49fcdf4ad97 (patch) | |
| tree | db17cb9c3d298f8c48256531acb5891bbd954c1d /src/com/gitblit/client/GitblitModel.java | |
| parent | a8cb5d4931d5f7d3707fec4c1fe3f4ead572c494 (diff) | |
| download | gitblit-5ae0b71e1e6e73e4bacf321a7d5be49fcdf4ad97.tar.gz gitblit-5ae0b71e1e6e73e4bacf321a7d5be49fcdf4ad97.zip | |
Properly handle anonymous registrations.
Diffstat (limited to 'src/com/gitblit/client/GitblitModel.java')
| -rw-r--r-- | src/com/gitblit/client/GitblitModel.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/gitblit/client/GitblitModel.java b/src/com/gitblit/client/GitblitModel.java index 92b0b1ce..22d67f62 100644 --- a/src/com/gitblit/client/GitblitModel.java +++ b/src/com/gitblit/client/GitblitModel.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map;
import com.gitblit.GitBlitException.ForbiddenException;
+import com.gitblit.GitBlitException.UnauthorizedException;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
import com.gitblit.models.FederationModel;
@@ -68,6 +69,7 @@ public class GitblitModel implements Serializable { refreshUsers();
refreshFederationRegistrations();
isAdmin = true;
+ } catch (UnauthorizedException e) {
} catch (ForbiddenException e) {
} catch (IOException e) {
System.err.println(e.getMessage());
@@ -79,7 +81,7 @@ public class GitblitModel implements Serializable { }
public boolean isOwner(RepositoryModel model) {
- return account.equalsIgnoreCase(model.owner);
+ return account != null && account.equalsIgnoreCase(model.owner);
}
public IStoredSettings getSettings() {
|