[hotfix] Preserve the singleton property for ResourceProfile#ANY.

apache · Nov 12, 2019 · 36d1b62 · 36d1b62
1 parent bfd6aa5
commit 36d1b62
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/...untime/src/main/java/org/apache/flink/runtime/clusterframework/types/ResourceProfile.java b/...untime/src/main/java/org/apache/flink/runtime/clusterframework/types/ResourceProfile.java
@@ -503,8 +503,17 @@ public String toString() {
 	// ------------------------------------------------------------------------
 
 	private Object readResolve() {
-		// try to preserve the singleton property for UNKNOWN
-		return this.equals(UNKNOWN) ? UNKNOWN : this;
+		// try to preserve the singleton property for UNKNOWN and ANY
+
+		if (this.equals(UNKNOWN)) {
+			return UNKNOWN;
+		}
+
+		if (this.equals(ANY)) {
+			return ANY;
+		}
+
+		return this;
 	}
 
 	// ------------------------------------------------------------------------

diff --git a/...me/src/test/java/org/apache/flink/runtime/clusterframework/types/ResourceProfileTest.java b/...me/src/test/java/org/apache/flink/runtime/clusterframework/types/ResourceProfileTest.java
@@ -260,4 +260,11 @@ public void testSingletonPropertyOfUnknown() throws Exception {
 
 		assertSame(ResourceProfile.UNKNOWN, copiedProfile);
 	}
+
+	@Test
+	public void testSingletonPropertyOfAny() throws Exception {
+		final ResourceProfile copiedProfile = CommonTestUtils.createCopySerializable(ResourceProfile.ANY);
+
+		assertSame(ResourceProfile.ANY, copiedProfile);
+	}
 }