From 86bea9e0016b2890db8ba83049dd4e89653a0a5e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 16 Mar 2012 17:29:39 -0400
Subject: [PATCH] Ensure that the welcome message is interpreted as UTF-8 (issue 74)
---
src/com/gitblit/models/FederationProposal.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/com/gitblit/models/FederationProposal.java b/src/com/gitblit/models/FederationProposal.java
index 03b31ce..5cf9182 100644
--- a/src/com/gitblit/models/FederationProposal.java
+++ b/src/com/gitblit/models/FederationProposal.java
@@ -37,6 +37,8 @@
public FederationToken tokenType;
public String token;
+
+ public String message;
public Map<String, RepositoryModel> repositories;
@@ -59,6 +61,7 @@
this.url = url;
this.tokenType = tokenType;
this.token = token;
+ this.message = "";
this.repositories = repositories;
try {
// determine server name and set that as the proposal name
@@ -66,7 +69,7 @@
if (name.contains("/")) {
name = name.substring(0, name.indexOf('/'));
}
- name = name.replace(".", "");
+ name = name.replace(".", "").replace(";", "").replace(":", "").replace("-", "");
} catch (Exception e) {
name = Long.toHexString(System.currentTimeMillis());
}
--
Gitblit v1.9.1