From 87163b405e60dba58453105cd8c06181d4f6b13a Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 05 Mar 2015 09:17:34 -0500 Subject: [PATCH] Merged #243 "Allow Forks is not saved on repository edit" --- src/main/java/com/gitblit/service/LuceneService.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/gitblit/service/LuceneService.java b/src/main/java/com/gitblit/service/LuceneService.java index 868a295..3f7635f 100644 --- a/src/main/java/com/gitblit/service/LuceneService.java +++ b/src/main/java/com/gitblit/service/LuceneService.java @@ -105,7 +105,7 @@ public class LuceneService implements Runnable { - private static final int INDEX_VERSION = 5; + private static final int INDEX_VERSION = 6; private static final String FIELD_OBJECT_TYPE = "type"; private static final String FIELD_PATH = "path"; @@ -125,7 +125,7 @@ private static final String CONF_ALIAS = "aliases"; private static final String CONF_BRANCH = "branches"; - private static final Version LUCENE_VERSION = Version.LUCENE_46; + private static final Version LUCENE_VERSION = Version.LUCENE_4_10_0; private final Logger logger = LoggerFactory.getLogger(LuceneService.class); @@ -437,7 +437,7 @@ // skip non-annotated tags continue; } - if (!tags.containsKey(tag.getObjectId())) { + if (!tags.containsKey(tag.getObjectId().getName())) { tags.put(tag.getReferencedObjectId().getName(), new ArrayList<String>()); } tags.get(tag.getReferencedObjectId().getName()).add(tag.displayName); @@ -760,7 +760,7 @@ // skip non-annotated tags continue; } - if (!tags.containsKey(tag.getObjectId())) { + if (!tags.containsKey(tag.getObjectId().getName())) { tags.put(tag.getReferencedObjectId().getName(), new ArrayList<String>()); } tags.get(tag.getReferencedObjectId().getName()).add(tag.displayName); -- Gitblit v1.9.1