geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dschnei...@apache.org
Subject [3/3] geode git commit: spotless
Date Thu, 31 Aug 2017 00:49:26 GMT
spotless


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/762f39a6
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/762f39a6
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/762f39a6

Branch: refs/heads/feature/GEODE-3543
Commit: 762f39a6e78a4fe395eca0f1a62c02a3470fef5d
Parents: 8762124
Author: Darrel Schneider <dschneider@pivotal.io>
Authored: Wed Aug 30 17:47:44 2017 -0700
Committer: Darrel Schneider <dschneider@pivotal.io>
Committed: Wed Aug 30 17:47:44 2017 -0700

----------------------------------------------------------------------
 .../java/org/apache/geode/internal/cache/ExpiryTask.java     | 5 +++--
 .../java/org/apache/geode/cache30/MultiVMRegionTestCase.java | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/762f39a6/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
index 129688f..9e21115 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/ExpiryTask.java
@@ -456,8 +456,8 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
   private static final ThreadLocal<Long> now = new ThreadLocal<Long>();
 
   /**
-   * To reduce the number of times we need to call calculateNow, you can call this method
-   * to set now in a thread local. When the run returns the thread local is cleared.
+   * To reduce the number of times we need to call calculateNow, you can call this method
to set now
+   * in a thread local. When the run returns the thread local is cleared.
    */
   static void doWithNowSet(LocalRegion lr, Runnable runnable) {
     now.set(calculateNow(lr.getCache()));
@@ -488,6 +488,7 @@ public abstract class ExpiryTask extends SystemTimer.SystemTimerTask {
   public long calculateNow() {
     return calculateNow(getLocalRegion().getCache());
   }
+
   public static long calculateNow(InternalCache cache) {
     if (cache != null) {
       // Use cache.cacheTimeMillis here. See bug 52267.

http://git-wip-us.apache.org/repos/asf/geode/blob/762f39a6/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
b/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
index 870e1be..e7e6ee1 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/MultiVMRegionTestCase.java
@@ -3933,8 +3933,8 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
                       ((InternalDistributedSystem) (region.getCache().getDistributedSystem()))
                           .getClock().getStopTime();
                   logger.info("DEBUG: waiting for expire destroy expirationTime= "
-                      + eet.getExpirationTime() + " now=" + eet.calculateNow() + " stopTime="
+ stopTime
-                      + " currentTimeMillis=" + System.currentTimeMillis());
+                      + eet.getExpirationTime() + " now=" + eet.calculateNow() + " stopTime="
+                      + stopTime + " currentTimeMillis=" + System.currentTimeMillis());
                 } else {
                   logger.info("DEBUG: waiting for expire destroy but expiry task is null");
                 }
@@ -3948,8 +3948,8 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase {
               try {
                 EntryExpiryTask eet = getEntryExpiryTask(region, key);
                 if (eet != null) {
-                  expiryInfo = "expirationTime= " + eet.getExpirationTime() + " now=" + eet.calculateNow()
-                      + " currentTimeMillis=" + System.currentTimeMillis();
+                  expiryInfo = "expirationTime= " + eet.getExpirationTime() + " now="
+                      + eet.calculateNow() + " currentTimeMillis=" + System.currentTimeMillis();
                 }
               } catch (EntryNotFoundException ex) {
                 expiryInfo = "EntryNotFoundException when getting expiry task";


Mime
View raw message