Fix node regeneration

naver · Jul 19, 2024 · 32b80ab · 32b80ab
1 parent 81bea80
commit 32b80ab
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/...src/main/java/com/navercorp/fixturemonkey/api/arbitrary/ContainerCombinableArbitrary.java b/...src/main/java/com/navercorp/fixturemonkey/api/arbitrary/ContainerCombinableArbitrary.java
@@ -70,6 +70,10 @@ public void clear() {
 
 	@Override
 	public boolean fixed() {
+		if (combinableArbitraryList.isEmpty()) {
+			return false;
+		}
+
 		return combinableArbitraryList.stream()
 			.allMatch(CombinableArbitrary::fixed);
 	}

diff --git a/...onkey/src/main/java/com/navercorp/fixturemonkey/resolver/ResolvedCombinableArbitrary.java b/...onkey/src/main/java/com/navercorp/fixturemonkey/resolver/ResolvedCombinableArbitrary.java
@@ -75,10 +75,10 @@ public T combined() {
 				return arbitrary.getValue()
 					.filter(VALIDATION_ANNOTATION_FILTERING_COUNT, this.validateFilter(validOnly))
 					.combined();
-			} catch (ContainerSizeFilterMissException ex) {
+			} catch (ContainerSizeFilterMissException | RetryableFilterMissException ex) {
 				lastException = ex;
 				objectTree.clear();
-			} catch (FixedValueFilterMissException | RetryableFilterMissException ex) {
+			} catch (FixedValueFilterMissException ex) {
 				lastException = ex;
 			} finally {
 				arbitrary.clear();
@@ -102,10 +102,10 @@ public Object rawValue() {
 				return arbitrary.getValue()
 					.filter(VALIDATION_ANNOTATION_FILTERING_COUNT, this.validateFilter(validOnly))
 					.rawValue();
-			} catch (ContainerSizeFilterMissException ex) {
+			} catch (ContainerSizeFilterMissException | RetryableFilterMissException ex) {
 				lastException = ex;
 				objectTree.clear();
-			} catch (FixedValueFilterMissException | RetryableFilterMissException ex) {
+			} catch (FixedValueFilterMissException ex) {
 				lastException = ex;
 			} finally {
 				arbitrary.clear();