Replace objectDatabase reference with conflictsDatabase

Signed-off-by: Erik Merkle <emerkle@boundlessgeo.com>
geoserver · Sep 22, 2017 · ba9eea7 · ba9eea7
1 parent 722d240
commit ba9eea7
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/community/geogig/src/main/java/org/geogig/geoserver/config/GeoServerContextBuilder.java b/src/community/geogig/src/main/java/org/geogig/geoserver/config/GeoServerContextBuilder.java
@@ -96,7 +96,7 @@ protected void configure() {
             for (StorageProvider sp : providers) {
                 VersionedFormat objectDatabaseFormat = sp.getObjectDatabaseFormat();
                 VersionedFormat indexDatabaseFormat = sp.getIndexDatabaseFormat();
-                VersionedFormat graphDatabaseFormat = sp.getGraphDatabaseFormat();
+                VersionedFormat conflictsDatabaseFormat = sp.getConflictsDatabaseFormat();
                 VersionedFormat refsDatabaseFormat = sp.getRefsDatabaseFormat();
 
                 if (objectDatabaseFormat != null) {
@@ -105,8 +105,8 @@ protected void configure() {
                 if (indexDatabaseFormat != null) {
                     GeoServerContextBuilder.bind(indexPlugins, indexDatabaseFormat);
                 }
-                if (graphDatabaseFormat != null) {
-                    GeoServerContextBuilder.bind(graphPlugins, graphDatabaseFormat);
+                if (conflictsDatabaseFormat != null) {
+                    GeoServerContextBuilder.bind(graphPlugins, conflictsDatabaseFormat);
                 }
                 if (refsDatabaseFormat != null) {
                     GeoServerContextBuilder.bind(refPlugins, refsDatabaseFormat);