github
/
OpenID-Connect-Java-Spring-Server
mirror of https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added some null safety to the reader

pull/650/head
Justin Richer 2014-05-13 13:37:20 -04:00
parent cb9a18f262
commit 9acbfaed43
1 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/MITREidDataService_1_0.java
View File

@ -538,8 +538,12 @@ public class MITREidDataService_1_0 implements MITREidDataService {
if (name.equals("id")) {
currentId = reader.nextLong();
} else if (name.equals("expiration")) {
Date date = utcToDate(reader.nextString());
token.setExpiration(date);
if (reader.peek() == JsonToken.NULL) {
reader.nextNull();
} else {
Date date = utcToDate(reader.nextString());
token.setExpiration(date);
}
} else if (name.equals("value")) {
token.setValue(reader.nextString());
} else if (name.equals("clientId")) {
@ -590,8 +594,12 @@ public class MITREidDataService_1_0 implements MITREidDataService {
if (name.equals("id")) {
currentId = reader.nextLong();
} else if (name.equals("expiration")) {
Date date = utcToDate(reader.nextString());
token.setExpiration(date);
if (reader.peek() == JsonToken.NULL) {
reader.nextNull();
} else {
Date date = utcToDate(reader.nextString());
token.setExpiration(date);
}
} else if (name.equals("value")) {
token.setValue(reader.nextString());
} else if (name.equals("clientId")) {
@ -599,9 +607,17 @@ public class MITREidDataService_1_0 implements MITREidDataService {
} else if (name.equals("authenticationHolderId")) {
authHolderId = reader.nextLong();
} else if (name.equals("refreshTokenId")) {
refreshTokenId = reader.nextLong();
if (reader.peek() == JsonToken.NULL) {
reader.nextNull();
} else {
refreshTokenId = reader.nextLong();
}
} else if (name.equals("idTokenId")) {
idTokenId = reader.nextLong();
if (reader.peek() == JsonToken.NULL) {
reader.nextNull();
} else {
idTokenId = reader.nextLong();
}
} else if (name.equals("scope")) {
reader.beginArray();
Set<String> scope = new HashSet<String>();