From 77c047343854d194a1fcfdb77c304949930f6abb Mon Sep 17 00:00:00 2001
From: Justin Richer <jricher@mitre.org>
Date: Tue, 10 Sep 2013 17:26:21 -0400
Subject: [PATCH] fixed comparison order to be null safe

cleaned up type check
---
 .../openid/connect/service/impl/DefaultUserInfoService.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoService.java b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoService.java
index 93c2d5efe..5234fe52d 100644
--- a/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoService.java
+++ b/openid-connect-server/src/main/java/org/mitre/openid/connect/service/impl/DefaultUserInfoService.java
@@ -17,6 +17,7 @@
 package org.mitre.openid.connect.service.impl;
 
 import org.mitre.oauth2.model.ClientDetailsEntity;
+import org.mitre.oauth2.model.ClientDetailsEntity.SubjectType;
 import org.mitre.oauth2.service.ClientDetailsEntityService;
 import org.mitre.openid.connect.model.UserInfo;
 import org.mitre.openid.connect.repository.UserInfoRepository;
@@ -74,7 +75,7 @@ public class DefaultUserInfoService implements UserInfoService {
 			return null;
 		}
 
-		if (client.getSubjectType().equals(ClientDetailsEntity.SubjectType.PAIRWISE)) {
+		if (SubjectType.PAIRWISE.equals(client.getSubjectType())) {
 			String pairwiseSub = pairwiseIdentifierService.getIdentifier(userInfo, client);
 			userInfo.setSub(pairwiseSub);
 		}