Fix ArrayIndexOutOfBoundsException when accessing single value of empty multi value property.

Author: wolf.bubenik

magkit-core/src/main/java/de/ibmix/magkit/core/utils/PropertyUtils.java

@@ -23,6 +23,7 @@
 import info.magnolia.jcr.wrapper.DelegatePropertyWrapper;
 import info.magnolia.jcr.wrapper.HTMLEscapingContentDecorator;
 import info.magnolia.jcr.wrapper.HTMLEscapingPropertyWrapper;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -191,7 +192,7 @@ private static Value getUnwrappedValue(@Nullable final Property input) {
         Value result = null;
         if (exists(input)) {
             try {
-                result = input.isMultiple() ? input.getValues()[0] : input.getValue();
+                result = input.isMultiple() ? ArrayUtils.get(input.getValues(), 0) : input.getValue();
             } catch (RepositoryException e) {
                 // ignore and return empty result
                 LOGGER.debug("Cannot access value of property ", e);

magkit-core/src/test/java/de/ibmix/magkit/core/utils/PropertyUtilsTest.java

@@ -21,6 +21,7 @@
  */
 
 import de.ibmix.magkit.test.jcr.NodeStubbingOperation;
+import info.magnolia.jcr.decoration.ContentDecoratorPropertyWrapper;
 import info.magnolia.jcr.wrapper.HTMLEscapingPropertyWrapper;
 import org.junit.After;
 import org.junit.Before;
@@ -30,6 +31,7 @@
 import javax.jcr.Node;
 import javax.jcr.Property;
 import javax.jcr.RepositoryException;
+import javax.jcr.Value;
 import java.util.Calendar;
 import java.util.Collection;
 import java.util.TimeZone;
@@ -55,12 +57,14 @@
 import static de.ibmix.magkit.test.jcr.NodeMockUtils.mockNode;
 import static de.ibmix.magkit.test.jcr.NodeStubbingOperation.stubProperty;
 import static de.ibmix.magkit.test.jcr.PropertyMockUtils.mockProperty;
+import static de.ibmix.magkit.test.jcr.PropertyStubbingOperation.stubValues;
 import static de.ibmix.magkit.test.jcr.ValueMockUtils.mockBinary;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.core.Is.is;
 import static org.hamcrest.core.IsNull.notNullValue;
 import static org.hamcrest.core.IsNull.nullValue;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 
 /**
@@ -464,4 +468,27 @@ public void getBinaryValuesTest() throws RepositoryException {
         assertThat(getBinaryValues(mockProperty("test", b, a)).get(0), is(b));
         assertThat(getBinaryValues(mockProperty("test", b, a)).get(1), is(a));
     }
+
+    @Test
+    public void getValue() throws RepositoryException {
+        assertThat(PropertyUtils.getValue(null), nullValue());
+
+        Property p = mockProperty("test");
+        assertThat(PropertyUtils.getValue(p), nullValue());
+
+        // Test nor exception on empty multi value property:
+        stubValues(new Value[0]).of(p);
+        doReturn(true).when(p).isMultiple();
+        assertThat(PropertyUtils.getValue(p), nullValue());
+
+        stubValues("first").of(p);
+        assertThat(PropertyUtils.getValue(p).getString(), is("first"));
+
+        stubValues("first", "second", "third").of(p);
+        assertThat(PropertyUtils.getValue(p).getString(), is("first"));
+
+        // Test no NullPointerException on empty PropertyWrapper:
+        Property wrapper = new ContentDecoratorPropertyWrapper<>(null, null);
+        assertThat(PropertyUtils.getValue(wrapper), nullValue());
+    }
 }