fixed a bug with the admin user having no joined-on date set

apiman · Nov 6, 2015 · a291e68 · a291e68
1 parent dfb4743
commit a291e68
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/...ay/engine/policies/src/test/java/io/apiman/gateway/engine/policies/CachingPolicyTest.java b/...ay/engine/policies/src/test/java/io/apiman/gateway/engine/policies/CachingPolicyTest.java
@@ -64,8 +64,8 @@ public void testUploadLimit() throws Throwable {
         Assert.assertNotNull(counterValue3);
         Assert.assertEquals(counterValue, counterValue3);
 
-        // Now wait for 2s and make sure the cache entry expired
-        Thread.sleep(2000);
+        // Now wait for 3s and make sure the cache entry expired
+        Thread.sleep(3000);
         response = send(request);
         echo = response.entity(EchoResponse.class);
         Assert.assertNotNull(echo);

diff --git a/.../api/rest-impl/src/main/java/io/apiman/manager/api/rest/impl/CurrentUserResourceImpl.java b/.../api/rest-impl/src/main/java/io/apiman/manager/api/rest/impl/CurrentUserResourceImpl.java
@@ -97,7 +97,6 @@ public CurrentUserBean getInfo() {
                 user.setJoinedOn(new Date());
                 storage.beginTx();
                 try {
-                    user.setJoinedOn(new Date());
                     storage.createUser(user);
                     storage.commitTx();
                 } catch (StorageException e1) {

diff --git a/manager/test/api/src/main/java/io/apiman/manager/test/server/DefaultTestDataSeeder.java b/manager/test/api/src/main/java/io/apiman/manager/test/server/DefaultTestDataSeeder.java
@@ -19,6 +19,8 @@
 import io.apiman.manager.api.core.IStorage;
 import io.apiman.manager.api.core.exceptions.StorageException;
 
+import java.util.Date;
+
 /**
  * Default seeder used by tests.
  *
@@ -37,6 +39,7 @@ public void seed(IStorage storage) throws StorageException {
             userBean.setUsername(userInfo[0]);
             userBean.setFullName(userInfo[2]);
             userBean.setEmail(userInfo[3]);
+            userBean.setJoinedOn(new Date());
             if ("true".equals(System.getProperty("apiman.test.admin-user-only", "false")) && !userBean.getUsername().equals("admin")) {
                 continue;
             }