HHH-19596 Added checks to avoid NPE's

Author: cigaly

hibernate-core/src/main/java/org/hibernate/dialect/AbstractPostgreSQLStructJdbcType.java

@@ -1165,7 +1165,11 @@ public Object createJdbcValue(Object domainValue, WrapperOptions options) throws
 	public Object[] extractJdbcValues(Object rawJdbcValue, WrapperOptions options) throws SQLException {
 		assert embeddableMappingType != null;
 		final Object[] array = new Object[embeddableMappingType.getJdbcValueCount()];
-		deserializeStruct( getRawStructFromJdbcValue( rawJdbcValue ), 0, 0, array, true, options );
+		final String struct = getRawStructFromJdbcValue( rawJdbcValue );
+		if ( struct == null ) {
+			return null;
+		}
+		deserializeStruct( struct, 0, 0, array, true, options );
 		if ( inverseOrderMapping != null ) {
 			StructHelper.orderJdbcValues( embeddableMappingType, inverseOrderMapping, array.clone(), array );
 		}

hibernate-core/src/main/java/org/hibernate/type/descriptor/java/spi/EmbeddableAggregateJavaType.java

@@ -85,6 +85,9 @@ public <X> X unwrap(T value, Class<X> type, WrapperOptions options) {
 
 	@Override
 	public <X> T wrap(X value, WrapperOptions options) {
+		if ( value == null ) {
+			return null;
+		}
 		if ( getJavaTypeClass().isInstance( value ) ) {
 			//noinspection unchecked
 			return (T) value;

hibernate-core/src/main/java/org/hibernate/type/descriptor/jdbc/ArrayJdbcType.java

@@ -191,13 +191,19 @@ protected <X> X getArray(BasicExtractor<X> extractor, java.sql.Array array, Wrap
 			final Object rawArray = array.getArray();
 			final Object[] domainObjects = new Object[Array.getLength( rawArray )];
 			for ( int i = 0; i < domainObjects.length; i++ ) {
-				final Object[] aggregateRawValues = aggregateJdbcType.extractJdbcValues( Array.get( rawArray, i ), options );
-				final StructAttributeValues attributeValues = StructHelper.getAttributeValues(
-						embeddableMappingType,
-						aggregateRawValues,
-						options
-				);
-				domainObjects[i] = instantiate( embeddableMappingType, attributeValues, options.getSessionFactory() );
+				final Object rawJdbcValue = Array.get(rawArray, i);
+				if (rawJdbcValue == null) {
+					domainObjects[i] = null;
+				}
+				else {
+					final Object[] aggregateRawValues = aggregateJdbcType.extractJdbcValues(rawJdbcValue, options);
+					final StructAttributeValues attributeValues = StructHelper.getAttributeValues(
+							embeddableMappingType,
+							aggregateRawValues,
+							options
+					);
+					domainObjects[i] = instantiate( embeddableMappingType, attributeValues, options.getSessionFactory() );
+				}
 			}
 			return extractor.getJavaType().wrap( domainObjects, options );
 		}