[10/50] [abbrv] geode git commit: GEODE-3115 Added changes to check for persistent region during pdx type registry.

2017-07-28 Thread zhouxj 
GEODE-3115 Added changes to check for persistent region during pdx type 
registry.


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

Branch: refs/heads/feature/GEM-1483
Commit: 067531776f73828d6dfa981096641539e56e6c0a
Parents: e7515f5
Author: Anil 
Authored: Tue Jul 25 10:08:15 2017 -0700
Committer: Anil 
Committed: Tue Jul 25 10:09:40 2017 -0700

--
 .../geode/internal/cache/GemFireCacheImpl.java  |  23 +-
 .../geode/internal/cache/InternalCache.java |   2 +
 .../internal/cache/xmlcache/CacheCreation.java  |   5 +
 .../pdx/internal/PeerTypeRegistration.java  |  18 +-
 .../geode/pdx/PdxAttributesJUnitTest.java   | 239 ---
 5 files changed, 184 insertions(+), 103 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/06753177/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
--
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 de5fd88..f176d22 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
@@ -76,13 +76,12 @@ import javax.transaction.TransactionManager;
 
 import com.sun.jna.Native;
 import com.sun.jna.Platform;
-import org.apache.commons.lang.StringUtils;
 
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.Logger;
 import org.apache.geode.internal.cache.event.EventTracker;
 import org.apache.geode.internal.cache.event.EventTrackerExpiryTask;
 import org.apache.geode.internal.security.SecurityServiceFactory;
-import org.apache.logging.log4j.Logger;
-
 import org.apache.geode.CancelCriterion;
 import org.apache.geode.CancelException;
 import org.apache.geode.ForcedDisconnectException;
@@ -3216,6 +3215,24 @@ public class GemFireCacheImpl implements InternalCache, 
InternalClientCache, Has
 return result;
   }
 
+  @SuppressWarnings("unchecked")
+  @Override
+  public boolean hasPersistentRegion() {
+synchronized (this.rootRegions) {
+  for (LocalRegion region : this.rootRegions.values()) {
+if (region.getDataPolicy().withPersistence()) {
+  return true;
+}
+for (LocalRegion subRegion : (Set) 
region.basicSubregions(true)) {
+  if (subRegion.getDataPolicy().withPersistence()) {
+return true;
+  }
+}
+  }
+  return false;
+}
+  }
+
   @Override
   public void setRegionByPath(String path, LocalRegion r) {
 if (r == null) {

http://git-wip-us.apache.org/repos/asf/geode/blob/06753177/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
index aed439c..d162010 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
@@ -313,4 +313,6 @@ public interface InternalCache extends Cache, 
Extensible, CacheTime {
   void waitForRegisterInterestsInProgress();
 
   SecurityService getSecurityService();
+
+  boolean hasPersistentRegion();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/06753177/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
index db5f7ca..a7f2a11 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
@@ -2204,4 +2204,9 @@ public class CacheCreation implements InternalCache {
   public URL getCacheXmlURL() {
 throw new 
UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
   }
+
+  @Override
+  public boolean hasPersistentRegion() {
+throw new 
UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/06753177/geode-core/src/main/java/org/apache/geode/pdx/internal/PeerTypeRegistration.java

geode git commit: GEODE-3115 Added changes to check for persistent region during pdx type registry.

2017-07-25 Thread agingade 
Repository: geode
Updated Branches:
  refs/heads/develop e7515f595 -> 067531776


GEODE-3115 Added changes to check for persistent region during pdx type 
registry.


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

Branch: refs/heads/develop
Commit: 067531776f73828d6dfa981096641539e56e6c0a
Parents: e7515f5
Author: Anil 
Authored: Tue Jul 25 10:08:15 2017 -0700
Committer: Anil 
Committed: Tue Jul 25 10:09:40 2017 -0700

--
 .../geode/internal/cache/GemFireCacheImpl.java  |  23 +-
 .../geode/internal/cache/InternalCache.java |   2 +
 .../internal/cache/xmlcache/CacheCreation.java  |   5 +
 .../pdx/internal/PeerTypeRegistration.java  |  18 +-
 .../geode/pdx/PdxAttributesJUnitTest.java   | 239 ---
 5 files changed, 184 insertions(+), 103 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/06753177/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
--
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 de5fd88..f176d22 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
@@ -76,13 +76,12 @@ import javax.transaction.TransactionManager;
 
 import com.sun.jna.Native;
 import com.sun.jna.Platform;
-import org.apache.commons.lang.StringUtils;
 
+import org.apache.commons.lang.StringUtils;
+import org.apache.logging.log4j.Logger;
 import org.apache.geode.internal.cache.event.EventTracker;
 import org.apache.geode.internal.cache.event.EventTrackerExpiryTask;
 import org.apache.geode.internal.security.SecurityServiceFactory;
-import org.apache.logging.log4j.Logger;
-
 import org.apache.geode.CancelCriterion;
 import org.apache.geode.CancelException;
 import org.apache.geode.ForcedDisconnectException;
@@ -3216,6 +3215,24 @@ public class GemFireCacheImpl implements InternalCache, 
InternalClientCache, Has
 return result;
   }
 
+  @SuppressWarnings("unchecked")
+  @Override
+  public boolean hasPersistentRegion() {
+synchronized (this.rootRegions) {
+  for (LocalRegion region : this.rootRegions.values()) {
+if (region.getDataPolicy().withPersistence()) {
+  return true;
+}
+for (LocalRegion subRegion : (Set) 
region.basicSubregions(true)) {
+  if (subRegion.getDataPolicy().withPersistence()) {
+return true;
+  }
+}
+  }
+  return false;
+}
+  }
+
   @Override
   public void setRegionByPath(String path, LocalRegion r) {
 if (r == null) {

http://git-wip-us.apache.org/repos/asf/geode/blob/06753177/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
index aed439c..d162010 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/InternalCache.java
@@ -313,4 +313,6 @@ public interface InternalCache extends Cache, 
Extensible, CacheTime {
   void waitForRegisterInterestsInProgress();
 
   SecurityService getSecurityService();
+
+  boolean hasPersistentRegion();
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/06753177/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
index db5f7ca..a7f2a11 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/xmlcache/CacheCreation.java
@@ -2204,4 +2204,9 @@ public class CacheCreation implements InternalCache {
   public URL getCacheXmlURL() {
 throw new 
UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
   }
+
+  @Override
+  public boolean hasPersistentRegion() {
+throw new 
UnsupportedOperationException(LocalizedStrings.SHOULDNT_INVOKE.toLocalizedString());
+  }
 }

http://git-wip-us.apache.org/repos/asf/geode/blob/06753177/geode-core/src/main/java/org/apache/geode/pdx/in