geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jinmeil...@apache.org
Subject [2/4] incubator-geode git commit: Merge branch 'feature/GEODE-1571' of ssh://github.com/jinmeiliao/incubator-geode into feature/GEODE-1571
Date Thu, 07 Jul 2016 22:23:54 GMT
Merge branch 'feature/GEODE-1571' of ssh://github.com/jinmeiliao/incubator-geode into feature/GEODE-1571


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

Branch: refs/heads/feature/GEODE-1571
Commit: 374ccf1283be68275068b78ec7fd59dec903fef7
Parents: 25a80da bab4e62
Author: gmeilen <gracemeilen@gmail.com>
Authored: Thu Jul 7 14:02:54 2016 -0700
Committer: gmeilen <gracemeilen@gmail.com>
Committed: Thu Jul 7 14:02:54 2016 -0700

----------------------------------------------------------------------
 geode-assembly/build.gradle                     |    4 +-
 .../DataSerializerRecoveryListener.java         |   33 +-
 .../internal/AbstractDistributionConfig.java    |   21 +-
 .../gemfire/distributed/internal/CacheTime.java |   29 +
 .../gemfire/distributed/internal/DSClock.java   |    7 +-
 .../internal/cache/AbstractRegionEntry.java     |    2 +-
 .../internal/cache/AbstractRegionMap.java       |   46 +-
 .../gemfire/internal/cache/BucketRegion.java    |   18 +-
 .../internal/cache/GemFireCacheImpl.java        |    3 +-
 .../internal/cache/InitialImageOperation.java   |    4 +-
 .../gemfire/internal/cache/LocalRegion.java     |   25 +-
 .../internal/cache/PartitionedRegion.java       |    4 +
 .../gemfire/internal/cache/ProxyRegionMap.java  |    7 -
 .../gemfire/internal/cache/RegionMap.java       |    5 -
 .../gemfire/internal/cache/TXEntryState.java    |    4 +-
 .../internal/cache/TombstoneService.java        | 1211 +++++++++---------
 .../DestroyRegionOnDataStoreMessage.java        |    3 +-
 .../cache/tier/sockets/BaseCommandQuery.java    |   34 +-
 .../cache/tier/sockets/CacheClientProxy.java    |  136 +-
 .../tier/sockets/ClientInterestMessageImpl.java |   40 +
 .../internal/cache/tier/sockets/HandShake.java  |    3 +-
 .../parallel/ParallelGatewaySenderQueue.java    |   18 +-
 .../internal/offheap/FreeListManager.java       |    2 +-
 .../internal/security/GeodeSecurityUtil.java    |   11 +
 .../CreateAlterDestroyRegionCommands.java       |   33 +-
 .../cli/functions/DataCommandFunction.java      |   21 +-
 .../DistributedAckRegionCCEDUnitTest.java       |   10 +-
 .../cache30/GlobalRegionCCEDUnitTest.java       |    2 +-
 .../gemfire/cache30/MultiVMRegionTestCase.java  |  107 +-
 .../internal/DistributionConfigJUnitTest.java   |   32 +-
 .../GemFireDeadlockDetectorDUnitTest.java       |    1 +
 .../internal/cache/GIIDeltaDUnitTest.java       |    8 +-
 ...rtitionedRegionDelayedRecoveryDUnitTest.java |    9 +-
 .../cache/TombstoneCreationJUnitTest.java       |    6 +-
 .../PersistentRVVRecoveryDUnitTest.java         |    9 +-
 .../cache/tier/sockets/CacheServerTestUtil.java |   43 +-
 .../cache/wan/AsyncEventQueueTestBase.java      |   32 +-
 .../asyncqueue/AsyncEventListenerDUnitTest.java |   98 ++
 ...eateAlterDestroyRegionCommandsDUnitTest.java |   78 +-
 ...tedClientContainsKeyAuthDistributedTest.java |    1 -
 ...urityNoShowValue1PostProcessorDUnitTest.java |    6 +-
 ...ntegratedSecurityPostProcessorDUnitTest.java |    4 +
 .../sockets/DurableClientSimpleDUnitTest.java   |  357 ++----
 .../tier/sockets/DurableClientTestCase.java     |  158 +--
 .../lucene/internal/IndexRepositoryFactory.java |   71 +
 .../lucene/internal/LuceneEventListener.java    |    8 +-
 .../cache/lucene/internal/LuceneIndexImpl.java  |    2 +-
 .../internal/PartitionedRepositoryManager.java  |   28 +-
 .../repository/IndexRepositoryImpl.java         |    8 +-
 .../gemfire/cache/lucene/LuceneQueriesBase.java |   14 +-
 .../cache/lucene/LuceneQueriesPRBase.java       |  216 +++-
 .../lucene/LuceneQueriesPeerPRDUnitTest.java    |    8 +-
 .../LuceneQueriesPeerPRRedundancyDUnitTest.java |   54 +-
 .../internal/LuceneEventListenerJUnitTest.java  |    6 +-
 ...oncurrentParallelGatewaySenderDUnitTest.java |   22 +-
 55 files changed, 1806 insertions(+), 1316 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/374ccf12/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/GemFireCacheImpl.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/374ccf12/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
----------------------------------------------------------------------
diff --cc geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
index d93c93f,0661602..9ae658c
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/security/GeodeSecurityUtil.java
@@@ -339,14 -337,27 +339,24 @@@ public class GeodeSecurityUtil 
  
    }
  
 -  public static void close(Properties securityProps) {
 -    if (securityProps != null) {
 -      String customAuthenticator = securityProps.getProperty(SECURITY_MANAGER);
 -      Object authenticatorObject = getObject(customAuthenticator);
 -      if (authenticatorObject != null && authenticatorObject instanceof SecurityManager)
{
 -        ((SecurityManager) authenticatorObject).close();
 +  public static void close() {
 +      if (securityManager != null) {
 +        securityManager.close();
 +        securityManager = null;
        }
 -    }
 -    return;
 +
    }
  
+   /**
+    * postProcess call already has this logic built in, you don't need to call this everytime
you call postProcess.
+    * But if your postProcess is pretty involved with preparations and you need to bypass
it entirely, call this first.
+    * @return
+    */
+   public static boolean needPostProcess(){
+     Subject subject = getSubject();
+     return (subject != null && postProcessor != null);
+   }
+ 
    public static Object postProcess(String regionPath, Object key, Object result){
      if(postProcessor == null)
        return result;


Mime
View raw message