CSAFE-7695: container name missing when suffix not given

rtveitch · Dec 2, 2016 · eac1c11 · eac1c11
1 parent 76ce20f
commit eac1c11
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/og-configuration/src/main/java/com/cleversafe/og/guice/OGModule.java b/og-configuration/src/main/java/com/cleversafe/og/guice/OGModule.java
@@ -588,6 +588,8 @@ public String apply(final Map<String, String> input) {
         String suffix = input.get(Context.X_OG_CONTAINER_SUFFIX);
         if (suffix != null) {
           if (Integer.parseInt(suffix) == -1) {
+            // use the container name provided without suffix
+            input.put(Context.X_OG_CONTAINER_NAME, container);
             return container;
           } else {
             String containerName = container.concat(suffix);
@@ -603,6 +605,8 @@ public String apply(final Map<String, String> input) {
             return container.concat(suffix);
           } else {
             input.put(Context.X_OG_CONTAINER_SUFFIX, "-1");
+            // use the container name provided without suffix
+            input.put(Context.X_OG_CONTAINER_NAME, container);
             return container;
           }
         }