Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix a bug about Environment merge #62

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix a bug about Environment merge #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/com/ververica/flink/table/gateway/config/entries/ServerEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ public Map<String, String> asTopLevelMap() {
* overwritten by the second one.
*/
public static ServerEntry merge(ServerEntry gateway1, ServerEntry gateway2) {
final Map<String, String> mergedProperties = new HashMap<>(gateway1.asTopLevelMap());
mergedProperties.putAll(gateway2.asTopLevelMap());
final Map<String, String> mergedProperties = new HashMap<>(gateway1.asMap());
mergedProperties.putAll(gateway2.asMap());

final DescriptorProperties properties = new DescriptorProperties(true);
properties.putProperties(mergedProperties);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/ververica/flink/table/gateway/config/entries/SessionEntry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ public Map<String, String> asTopLevelMap() {
* overwritten by the second one.
*/
public static SessionEntry merge(SessionEntry session1, SessionEntry session2) {
final Map<String, String> mergedProperties = new HashMap<>(session1.asTopLevelMap());
mergedProperties.putAll(session2.asTopLevelMap());
final Map<String, String> mergedProperties = new HashMap<>(session1.asMap());
mergedProperties.putAll(session2.asMap());

final DescriptorProperties properties = new DescriptorProperties(true);
properties.putProperties(mergedProperties);
Expand Down