honeymoose
/
hapi-fhir
mirror of https://github.com/hapifhir/hapi-fhir.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed a bug matching long ids in searchparams (#1203) 

* fixed a bug matching long ids in searchparams
This commit is contained in:
Ken Stevens 2019-02-09 13:45:51 -05:00 committed by GitHub
parent a5e10740c0
commit f34926bb18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hapi-fhir-jpaserver-base/src/test/java/ca/uhn/fhir/jpa/subscription/resthook/RestHookTestDstu3Test.java
View File

@ -57,6 +57,7 @@ public class RestHookTestDstu3Test extends BaseResourceProviderDstu3Test {
private static NotificationServlet ourNotificationServlet; private static NotificationServlet ourNotificationServlet;
private static String ourNotificationListenerServer; private static String ourNotificationListenerServer;
private static CountDownLatch communicationRequestListenerLatch; private static CountDownLatch communicationRequestListenerLatch;
private static SubscriptionDebugLogInterceptor ourSubscriptionDebugLogInterceptor = new SubscriptionDebugLogInterceptor();
@After @After
public void afterUnregisterRestHookListener() { public void afterUnregisterRestHookListener() {
@ -75,14 +76,13 @@ public class RestHookTestDstu3Test extends BaseResourceProviderDstu3Test {
myDaoConfig.setAllowMultipleDelete(new DaoConfig().isAllowMultipleDelete()); myDaoConfig.setAllowMultipleDelete(new DaoConfig().isAllowMultipleDelete());
mySubscriptionTestUtil.unregisterSubscriptionInterceptor(); mySubscriptionTestUtil.unregisterSubscriptionInterceptor();
myInterceptorRegistry.clearAnonymousHookForUnitTest(); myInterceptorRegistry.unregisterInterceptor(ourSubscriptionDebugLogInterceptor);
} }
@Before @Before
public void beforeRegisterRestHookListener() { public void beforeRegisterRestHookListener() {
mySubscriptionTestUtil.registerRestHookInterceptor(); mySubscriptionTestUtil.registerRestHookInterceptor();
SubscriptionDebugLogInterceptor interceptor = new SubscriptionDebugLogInterceptor(); myInterceptorRegistry.registerInterceptor(ourSubscriptionDebugLogInterceptor);
myInterceptorRegistry.registerInterceptor(interceptor);
} }
@Before @Before

2
hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/extractor/ResourceIndexedSearchParams.java
View File

@ -274,7 +274,7 @@ public final class ResourceIndexedSearchParams {
ResourceTable target = theResourceLink.getTargetResource(); ResourceTable target = theResourceLink.getTargetResource();
IdDt idDt = target.getIdDt(); IdDt idDt = target.getIdDt();
if (idDt.isIdPartValidLong()) { if (idDt.isIdPartValidLong()) {
return theReference.getIdPartAsLong() == idDt.getIdPartAsLong(); return theReference.getIdPartAsLong().equals(idDt.getIdPartAsLong());
} else { } else {
ForcedId forcedId = target.getForcedId(); ForcedId forcedId = target.getForcedId();
if (forcedId != null) { if (forcedId != null) {