geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jinmeil...@apache.org
Subject [27/50] [abbrv] incubator-geode git commit: GEODE-17: fix the precheck failures
Date Fri, 29 Apr 2016 19:23:37 GMT
GEODE-17: fix the precheck failures

* added the distributionConfig count since we added the shiro.ini file in the configuration
* add shiro-core.jar in the expected_jars.txt


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

Branch: refs/heads/develop
Commit: 7ed7916cacc8fdc0a6f2ef94d67209d15a005665
Parents: 5757ca4
Author: Jinmei Liao <jiliao@pivotal.io>
Authored: Fri Apr 22 09:56:04 2016 -0700
Committer: Jinmei Liao <jiliao@pivotal.io>
Committed: Fri Apr 22 09:56:04 2016 -0700

----------------------------------------------------------------------
 .../src/test/resources/expected_jars.txt        |  1 +
 .../EnvironmentVariablesHandlerInterceptor.java |  8 ++++++
 .../internal/DistributionConfigJUnitTest.java   | 26 +++++++++++---------
 3 files changed, 24 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7ed7916c/geode-assembly/src/test/resources/expected_jars.txt
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/resources/expected_jars.txt b/geode-assembly/src/test/resources/expected_jars.txt
index 159d1e6..da05d54 100644
--- a/geode-assembly/src/test/resources/expected_jars.txt
+++ b/geode-assembly/src/test/resources/expected_jars.txt
@@ -55,6 +55,7 @@ paranamer
 ra.jar
 scala-library
 scala-reflect
+shiro-core
 slf4j-api
 snappy-java
 spring-aop

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7ed7916c/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/EnvironmentVariablesHandlerInterceptor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/EnvironmentVariablesHandlerInterceptor.java
b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/EnvironmentVariablesHandlerInterceptor.java
index 34cf380..bb7a27d 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/EnvironmentVariablesHandlerInterceptor.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/web/controllers/support/EnvironmentVariablesHandlerInterceptor.java
@@ -108,6 +108,14 @@ public class EnvironmentVariablesHandlerInterceptor extends HandlerInterceptorAd
                               final Exception ex)
     throws Exception
   {
+    afterConcurrentHandlingStarted(request, response, handler);
     ShiroUtil.logout();
   }
+
+  @Override
+  public void afterConcurrentHandlingStarted(
+    HttpServletRequest request, HttpServletResponse response, Object handler)
+    throws Exception {
+    ENV.remove();
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7ed7916c/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
index d2b5643..7a54040 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
@@ -16,24 +16,28 @@
  */
 package com.gemstone.gemfire.distributed.internal;
 
+import static org.junit.Assert.*;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.*;
+
+import java.io.File;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
 import com.gemstone.gemfire.InternalGemFireException;
 import com.gemstone.gemfire.UnmodifiableException;
 import com.gemstone.gemfire.internal.ConfigSource;
 import com.gemstone.gemfire.test.junit.categories.UnitTest;
+
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import java.io.File;
-import java.lang.reflect.Method;
-import java.util.*;
-
-import static org.junit.Assert.*;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-
 /**
  * Created by jiliao on 2/2/16.
  */
@@ -65,7 +69,7 @@ public class DistributionConfigJUnitTest {
   @Test
   public void testGetAttributeNames() {
     String[] attNames = AbstractDistributionConfig._getAttNames();
-    assertEquals(attNames.length, 140);
+    assertEquals(attNames.length, 141);
 
     List boolList = new ArrayList();
     List intList = new ArrayList();
@@ -98,7 +102,7 @@ public class DistributionConfigJUnitTest {
     System.out.println("otherList: " + otherList);
     assertEquals(boolList.size(), 30);
     assertEquals(intList.size(), 33);
-    assertEquals(stringList.size(), 69);
+    assertEquals(stringList.size(), 70);
     assertEquals(fileList.size(), 5);
     assertEquals(otherList.size(), 3);
   }


Mime
View raw message