Create a deep copy of the first found fragment before merging other f…

…ragments into it (openhab#2412) Signed-off-by: Christoph Weitkamp <[email protected]>
ghys · Sep 9, 2021 · d0d4a31 · d0d4a31
1 parent 3e7f8ed
commit d0d4a31
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/...hab.core/src/main/java/org/openhab/core/internal/service/StateDescriptionServiceImpl.java b/...hab.core/src/main/java/org/openhab/core/internal/service/StateDescriptionServiceImpl.java
@@ -75,7 +75,8 @@ public void removeStateDescriptionFragmentProvider(StateDescriptionFragmentProvi
 
             // we pick up the first valid StateDescriptionFragment here:
             if (result == null) {
-                result = (StateDescriptionFragmentImpl) fragment;
+                // create a deep copy of the first found fragment before merging other fragments into it
+                result = new StateDescriptionFragmentImpl((StateDescriptionFragmentImpl) fragment);
             } else {
                 result.merge(fragment);
             }

diff --git a/...core/src/test/java/org/openhab/core/internal/service/StateDescriptionServiceImplTest.java b/...core/src/test/java/org/openhab/core/internal/service/StateDescriptionServiceImplTest.java
@@ -114,7 +114,7 @@ public void testIsReadOnlyWhenTwoDescriptionProvidersHigherRankingIsNotReadOnly(
 
         StateDescription stateDescription = item.getStateDescription();
 
-        assertThat(stateDescription.isReadOnly(), is(stateDescriptionFragment1.isReadOnly()));
+        assertThat(stateDescription.isReadOnly(), is(stateDescriptionFragment2.isReadOnly()));
     }
 
     @Test
@@ -167,8 +167,7 @@ public void testFragmentsAreMergedInProviderOrder() {
                 .withMinimum(BigDecimal.ZERO) //
                 .withMaximum(BigDecimal.TEN) //
                 .withPattern("pattern") //
-                .withReadOnly(Boolean.TRUE) //
-                .withOptions(options).build();
+                .withReadOnly(Boolean.TRUE).build();
         registerStateDescriptionFragmentProvider(stateDescriptionFragment1, -1);
 
         StateDescriptionFragment stateDescriptionFragment2 = StateDescriptionFragmentBuilder.create()
@@ -187,6 +186,8 @@ public void testFragmentsAreMergedInProviderOrder() {
         assertThat(stateDescription.getPattern(), is("pattern"));
         assertThat(stateDescription.isReadOnly(), is(true));
         assertThat(stateDescription.getOptions(), is(options));
+        // check that fragement2 is not merged into fragement1
+        assertThat(stateDescriptionFragment1.getOptions().size(), is(0));
     }
 
     private void registerStateDescriptionFragmentProvider(StateDescriptionFragment stateDescriptionFragment,