GEODE-275: fix race in testRegionExpirationAfterMutate

Author: dschneider-pivotal

gemfire-core/src/main/java/com/gemstone/gemfire/internal/tcp/MsgOutputStream.java

@@ -13,8 +13,8 @@
 import com.gemstone.gemfire.internal.*;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
-/** MsgOutputStream is deprecated. MsgStreamer should be used instead.
- * The one non-deprecated use is in Connection for the handshake.
+/** MsgOutputStream should no longer be used except in Connection
+ * to do the handshake. Otherwise MsgStreamer should always be used.
 
  @author Darrel
  @since 3.0

gemfire-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java

@@ -3767,9 +3767,16 @@ public void testRegionExpirationAfterMutate()
       region.getAttributesMutator().setRegionIdleTimeout(new ExpirationAttributes(999000/*ms*/, ExpirationAction.INVALIDATE));
       expiryTask = region.getRegionIdleExpiryTask();
       long hugeExpiryTime = expiryTask.getExpirationTime();
-      region.getAttributesMutator().setRegionIdleTimeout(new ExpirationAttributes(20/*ms*/, ExpirationAction.INVALIDATE));
-      expiryTask = region.getRegionIdleExpiryTask();
-      long shortExpiryTime = expiryTask.getExpirationTime();
+      ExpiryTask.suspendExpiration();
+      long shortExpiryTime;
+      try {
+        region.getAttributesMutator().setRegionIdleTimeout(new ExpirationAttributes(20/*ms*/, ExpirationAction.INVALIDATE));
+        expiryTask = region.getRegionIdleExpiryTask();
+        shortExpiryTime = expiryTask.getExpirationTime();
+        } 
+      finally {
+        ExpiryTask.permitExpiration();
+      }
       waitForInvalidate(entry, tilt+20, 10);
       assertTrue("expected hugeExpiryTime=" + hugeExpiryTime + " to be > than mediumExpiryTime=" + mediumExpiryTime, (hugeExpiryTime - mediumExpiryTime) > 0);
       assertTrue("expected mediumExpiryTime=" + mediumExpiryTime + " to be > than shortExpiryTime=" + shortExpiryTime, (mediumExpiryTime - shortExpiryTime) > 0);