This is an automated email from the ASF dual-hosted git repository.
klund pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push:
new c8b050f GEODE-5941: Remove comments containing developer name (#2731)
c8b050f is described below
commit c8b050fdf77f85c9d4d709d68a2c3c0de260e584
Author: Kirk Lund <[email protected]>
AuthorDate: Mon Oct 29 09:59:46 2018 -0700
GEODE-5941: Remove comments containing developer name (#2731)
This removes all mention of KIRK. There are still other developer
names present in comments.
---
.../org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java | 2 +-
.../wan/asyncqueue/ParallelAsyncEventListenerDistributedTest.java | 2 +-
.../org/apache/geode/distributed/internal/locks/DLockGrantor.java | 6 ++----
.../org/apache/geode/distributed/internal/locks/DLockService.java | 2 --
.../org/apache/geode/distributed/internal/locks/ElderState.java | 4 ++--
.../main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java | 2 +-
.../org/apache/geode/internal/logging/log4j/LogWriterAppenders.java | 1 -
.../java/org/apache/geode/internal/offheap/OffHeapStoredObject.java | 2 +-
.../apache/geode/internal/logging/LoggingPerformanceTestCase.java | 1 -
9 files changed, 8 insertions(+), 14 deletions(-)
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
index e41d0fa..38b6e64 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/cache/query/dunit/QueryUsingPoolDUnitTest.java
@@ -614,7 +614,7 @@ public class QueryUsingPoolDUnitTest extends
JUnit4CacheTestCase {
50, // 5
};
- assertNotNull(this.regionName);// KIRK
+ assertNotNull(this.regionName);
// Start server
final int port = vm0.invoke("Create Bridge Server", () -> {
diff --git
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/ParallelAsyncEventListenerDistributedTest.java
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/ParallelAsyncEventListenerDistributedTest.java
index 76b2b2b..69e8a5f 100644
---
a/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/ParallelAsyncEventListenerDistributedTest.java
+++
b/geode-core/src/distributedTest/java/org/apache/geode/internal/cache/wan/asyncqueue/ParallelAsyncEventListenerDistributedTest.java
@@ -580,7 +580,7 @@ public class ParallelAsyncEventListenerDistributedTest
implements Serializable {
vm0.invoke(() -> {
// give some time for rebalancing to happen
- SECONDS.sleep(2); // TODO:KIRK: await rebalancing to complete
+ SECONDS.sleep(2); // TODO: change to await rebalancing to complete
getInternalGatewaySender().resume();
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java
index afa8079..e2e1ab2 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockGrantor.java
@@ -1794,7 +1794,7 @@ public class DLockGrantor {
Assert.assertTrue(myRThread != null, "Attempted to suspend locking for
null RemoteThread");
Assert.assertTrue(this.lockingSuspendedBy == null ||
this.lockingSuspendedBy.equals(myRThread),
"Attempted to suspend locking for " + myRThread + " but locking is
already suspended by "
- + this.lockingSuspendedBy); // KIRK: assert fails in bug 37945
+ + this.lockingSuspendedBy);
this.suspendedLockId = lockId;
this.lockingSuspendedBy = myRThread;
}
@@ -1951,7 +1951,6 @@ public class DLockGrantor {
// boolean permitSuspend = false;
Integer integer = (Integer) readLockCountMap.get(rThread);
int readLockCount = integer == null ? 0 : integer.intValue();
- // Assert.assertTrue(readLockCount > 0, rThread + " not found in " +
readLockCountMap); // KIRK
if (readLockCount < 1) {
// hit bug 35749
if (isDebugEnabled_DLS) {
@@ -2490,8 +2489,7 @@ public class DLockGrantor {
* @return true if lock was granted to the request
*/
protected synchronized boolean grantLockToRequest(DLockRequestMessage
request) {
- Assert.assertTrue(request.getRemoteThread() != null); // KIRK search for
these assertions and
- // remove
+ Assert.assertTrue(request.getRemoteThread() != null);
if (isGranted(true) || hasWaitingRequests()) {
return false;
}
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
index 3f721a6..40e9276 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/DLockService.java
@@ -2316,12 +2316,10 @@ public class DLockService extends
DistributedLockService {
} while (retry);
}
- // KIRK: probably don't need to do the following if isMakingLockGrantor
if (isCurrentlyLockGrantor || isMakingLockGrantor) {
// If forcedDisconnect is in progress, the membership view will not
// change and no-one else can contact this member, so don't wait for a
grantor
if (this.ds.getCancelCriterion().isCancelInProgress()) {
- // KIRK: probably don't need to waitForGrantor
try {
DLockGrantor.waitForGrantor(this);
} catch (InterruptedException e) {
diff --git
a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java
b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java
index 1b613cc..2130c47 100644
---
a/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java
+++
b/geode-core/src/main/java/org/apache/geode/distributed/internal/locks/ElderState.java
@@ -304,8 +304,8 @@ public class ElderState {
GrantorInfo currentGI = (GrantorInfo) this.nameToInfo.get(serviceName);
if (currentGI == null) {
- return; // KIRK added this null check because becomeGrantor may not
have talked to elder
- // before destroy dls
+ // added null check because becomeGrantor may not have talked to elder
before destroy dls
+ return;
}
if (currentGI.getVersionId() != grantorVersion
|| currentGI.getSerialNumber() != dlsSerialNumber) {
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index 4851a9a..ceb93c4 100755
---
a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -4276,7 +4276,7 @@ public class GemFireCacheImpl implements InternalCache,
InternalClientCache, Has
}
}
- private static void closeQuietly(Closeable closeable) { // KIRK
+ private static void closeQuietly(Closeable closeable) {
try {
if (closeable != null) {
closeable.close();
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppenders.java
b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppenders.java
index 7e65c57..e6e7c4d 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppenders.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/logging/log4j/LogWriterAppenders.java
@@ -256,7 +256,6 @@ public class LogWriterAppenders {
}
public static synchronized void destroy(final Identifier id) {
- // TODO:LOG:KIRK: new Exception("KIRK destroy called for " +
id).printStackTrace();
LogWriterAppender appender = appenders.get(id);
if (appender == null) {
return;
diff --git
a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStoredObject.java
b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStoredObject.java
index 5a77a8d..360f31c 100644
---
a/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStoredObject.java
+++
b/geode-core/src/main/java/org/apache/geode/internal/offheap/OffHeapStoredObject.java
@@ -577,7 +577,7 @@ public class OffHeapStoredObject extends
AbstractStoredObject
}
}
- public void setDataSize(int dataSize) { // KIRK
+ public void setDataSize(int dataSize) {
assert dataSize <= getSize();
int delta = getSize() - dataSize;
assert delta <= (DATA_SIZE_DELTA_MASK >> DATA_SIZE_SHIFT);
diff --git
a/geode-core/src/performanceTest/java/org/apache/geode/internal/logging/LoggingPerformanceTestCase.java
b/geode-core/src/performanceTest/java/org/apache/geode/internal/logging/LoggingPerformanceTestCase.java
index 18245e8..23b0897 100644
---
a/geode-core/src/performanceTest/java/org/apache/geode/internal/logging/LoggingPerformanceTestCase.java
+++
b/geode-core/src/performanceTest/java/org/apache/geode/internal/logging/LoggingPerformanceTestCase.java
@@ -101,7 +101,6 @@ public abstract class LoggingPerformanceTestCase {
for (int sets = 0; sets < LOG_SETS; sets++) {
for (int count = 0; count < LOG_REPETITIONS_PER_SET; count++) {
perfLogger.log(message);
- // fail("KIRK");
}
}
stopWatch.stop();
