geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sbawas...@apache.org
Subject incubator-geode git commit: fixing compilation errors introduced by the merge.
Date Mon, 23 Nov 2015 21:49:51 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-578 b8e1fd224 -> 03c9f92f6


fixing compilation errors introduced by the merge.


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

Branch: refs/heads/feature/GEODE-578
Commit: 03c9f92f6f1abef2ef63405b5cdc4c59e2d95987
Parents: b8e1fd2
Author: Zach Gardner <zach@st5k.com>
Authored: Mon Nov 23 13:47:49 2015 -0800
Committer: Zach Gardner <zach@st5k.com>
Committed: Mon Nov 23 13:47:49 2015 -0800

----------------------------------------------------------------------
 .../gemfire/internal/cache/xmlcache/CacheCreation.java    | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/03c9f92f/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
index 0238dd6..e716f2f 100644
--- a/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
+++ b/gemfire-core/src/main/java/com/gemstone/gemfire/internal/cache/xmlcache/CacheCreation.java
@@ -606,7 +606,7 @@ public class CacheCreation implements InternalCache {
       List<CacheServer> cacheServers = cache.getCacheServers();
       if (cacheServers != null) {
         for(CacheServer cacheServer : cacheServers) {
-          if (serverPort == cacheServer.getPort() && cacheServer.getBindAddress().equals(serverBindAdd))
{
+          if (serverPort == cacheServer.getPort()) {
             existingCacheServer = true;
           }
         }
@@ -655,14 +655,6 @@ public class CacheCreation implements InternalCache {
                 .toLocalizedString(impl), ex);
       }
     }
-    cache.setBackupFiles(this.backups);
-    cache.addDeclarableProperties(this.declarablePropertiesMap);
-    runInitializer();
-    cache.setInitializer(getInitializer(), getInitializerProps());
-    
-    // UnitTest CacheXml81Test.testCacheExtension
-    // Create all extensions
-    extensionPoint.fireCreate(cache);
   }
 
   /**


Mime
View raw message