This is an automated email from the ASF dual-hosted git repository.

fjy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git


The following commit(s) were added to refs/heads/master by this push:
     new e240fba  Fix logs in SegmentLoaderLocalCacheManager (#7229)
e240fba is described below

commit e240fba2479ded04dde10f9ee5213ce237edc43a
Author: Jihoon Son <[email protected]>
AuthorDate: Mon Mar 11 21:16:03 2019 -0700

    Fix logs in SegmentLoaderLocalCacheManager (#7229)
---
 .../druid/segment/loading/SegmentLoaderLocalCacheManager.java     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/server/src/main/java/org/apache/druid/segment/loading/SegmentLoaderLocalCacheManager.java
 
b/server/src/main/java/org/apache/druid/segment/loading/SegmentLoaderLocalCacheManager.java
index 48049b0..327db5d 100644
--- 
a/server/src/main/java/org/apache/druid/segment/loading/SegmentLoaderLocalCacheManager.java
+++ 
b/server/src/main/java/org/apache/druid/segment/loading/SegmentLoaderLocalCacheManager.java
@@ -322,14 +322,16 @@ public class SegmentLoaderLocalCacheManager implements 
SegmentLoader
     );
   }
 
+  @SuppressWarnings("ObjectEquality")
   private void unlock(DataSegment dataSegment, ReferenceCountingLock lock)
   {
     segmentLocks.compute(
         dataSegment,
         (segment, existingLock) -> {
-          //noinspection ObjectEquality
-          if (existingLock == null || existingLock != lock) {
-            throw new ISE("WTH? Different createOrGetLock instance");
+          if (existingLock == null) {
+            throw new ISE("WTH? the given lock has already been removed");
+          } else if (existingLock != lock) {
+            throw new ISE("WTH? Different lock instance");
           } else {
             if (existingLock.numReferences == 1) {
               return null;


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to