Skip to content

Commit

Permalink
Merge branch 'moqui:master' into acetousk
Browse files Browse the repository at this point in the history
  • Loading branch information
acetousk authored Nov 7, 2024
2 parents 6684634 + 60dd57c commit b6e8cd7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions framework/src/main/java/org/moqui/util/RestClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package org.moqui.util;

import groovy.json.JsonBuilder;
import groovy.json.JsonSlurper;
import groovy.json.JsonSlurperClassic;
import org.eclipse.jetty.client.HttpClient;
import org.eclipse.jetty.client.HttpClientTransport;
import org.eclipse.jetty.client.HttpResponseException;
Expand Down Expand Up @@ -442,7 +442,7 @@ public String text() {
/** Parse the response as JSON and return an Object */
public Object jsonObject() {
try {
return new JsonSlurper().parseText(text());
return new JsonSlurperClassic().parseText(text());
} catch (Throwable t) {
throw new BaseException("Error parsing JSON response from request to " + rci.uriString, t);
}
Expand Down

0 comments on commit b6e8cd7

Please sign in to comment.