Skip to content

Commit

Permalink
Merge pull request #12573 from phillip-kruger/graphql-win-test-fix
Browse files Browse the repository at this point in the history
GraphQL fix for Windows build
  • Loading branch information
sberyozkin authored Oct 7, 2020
2 parents 8dba141 + 9fd1f97 commit 56dd01a
Showing 1 changed file with 4 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,13 @@ protected static String getPropertyAsString() {

protected static String getPropertyAsString(Map<String, String> otherProperties) {
try {
Properties p = new Properties();
p.putAll(PROPERTIES);
StringWriter writer = new StringWriter();
if (otherProperties != null) {
PROPERTIES.putAll(otherProperties);
p.putAll(otherProperties);
}
PROPERTIES.store(writer, "Test Properties");
p.store(writer, "Test Properties");
return writer.toString();
} catch (IOException ex) {
throw new RuntimeException(ex);
Expand Down

0 comments on commit 56dd01a

Please sign in to comment.