Merge pull request #2361 from GluuFederation/issues_2360

fix(oxtrust-server): fix sector identifier nullpointer #2360
GluuFederation · Aug 9, 2023 · 5f483df · 5f483df
2 parents 7c42f0f + 2a0ebc1
commit 5f483df
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/server/src/main/java/org/gluu/oxtrust/action/UpdateClientAction.java b/server/src/main/java/org/gluu/oxtrust/action/UpdateClientAction.java
@@ -9,6 +9,8 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
@@ -1995,13 +1997,14 @@ public List<SelectableEntity<CustomScript>> getAvailableSpontaneousScripts() {
     }
 
     private boolean loadSector(String sectorIdentifierUri) throws ClientProtocolException, IOException {
+    	try {
     	String sectoruriContent = downloadSectorIdentifierUri(sectorIdentifierUri);
 
     	if (sectoruriContent == null) {
     		return false;
     	}
 
-    	try {
+
             JSONArray uris = new JSONArray(sectoruriContent);
             this.loginUris.clear();
             for (int i = 0; i < uris.length(); i++) {
@@ -2035,8 +2038,9 @@ private String getResponseContent(HttpResponse httpResponse) throws IOException
     	return new String(responseBytes, StandardCharsets.UTF_8);
 	}
 
-    private String downloadSectorIdentifierUri(String sectorIdentifierUri) throws IOException, ClientProtocolException {
+    private String downloadSectorIdentifierUri(String sectorIdentifierUri) throws IOException, ClientProtocolException, URISyntaxException {
 		HttpGet httpGet = new HttpGet();
+		httpGet.setURI(new URI(sectorIdentifierUri));
     	httpGet.setHeader("Accept", "application/json");
 
     	String fileContent = null;