Fix static ordering problems
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3a0fe955 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3a0fe955 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3a0fe955 Branch: refs/heads/feature/GEODE-949-2 Commit: 3a0fe9550c6e97295c11e6e2f058969197132d64 Parents: a638800 Author: Kirk Lund <kl...@apache.org> Authored: Fri Mar 11 17:20:30 2016 -0800 Committer: Kirk Lund <kl...@apache.org> Committed: Fri Mar 11 17:20:30 2016 -0800 ---------------------------------------------------------------------- .../src/test/java/security/AuthzCredentialGenerator.java | 8 ++++---- .../src/test/java/security/CredentialGenerator.java | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3a0fe955/geode-core/src/test/java/security/AuthzCredentialGenerator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/security/AuthzCredentialGenerator.java b/geode-core/src/test/java/security/AuthzCredentialGenerator.java index e7644ee..7a2378c 100755 --- a/geode-core/src/test/java/security/AuthzCredentialGenerator.java +++ b/geode-core/src/test/java/security/AuthzCredentialGenerator.java @@ -323,16 +323,16 @@ public abstract class AuthzCredentialGenerator { */ public static final class ClassCode { + private static byte nextOrdinal = 0; + private static final byte ID_DUMMY = 1; private static final byte ID_XML = 2; - public static final ClassCode DUMMY = new ClassCode(templates.security.DummyAuthorization.class.getName() + ".create", ID_DUMMY); - public static final ClassCode XML = new ClassCode(templates.security.XmlAuthorization.class.getName() + ".create", ID_XML); - private static final ClassCode[] VALUES = new ClassCode[10]; private static final Map CODE_NAME_MAP = new HashMap(); - private static byte nextOrdinal = 0; + public static final ClassCode DUMMY = new ClassCode(templates.security.DummyAuthorization.class.getName() + ".create", ID_DUMMY); + public static final ClassCode XML = new ClassCode(templates.security.XmlAuthorization.class.getName() + ".create", ID_XML); /** The name of this class. */ private final String name; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3a0fe955/geode-core/src/test/java/security/CredentialGenerator.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/security/CredentialGenerator.java b/geode-core/src/test/java/security/CredentialGenerator.java index 704343c..6ff86dc 100755 --- a/geode-core/src/test/java/security/CredentialGenerator.java +++ b/geode-core/src/test/java/security/CredentialGenerator.java @@ -191,21 +191,21 @@ public abstract class CredentialGenerator { */ public static final class ClassCode { + private static byte nextOrdinal = 0; + private static final byte ID_DUMMY = 1; private static final byte ID_LDAP = 2; private static final byte ID_PKCS = 3; private static final byte ID_SSL = 4; + private static final ClassCode[] VALUES = new ClassCode[10]; + private static final Map CODE_NAME_MAP = new HashMap(); + public static final ClassCode DUMMY = new ClassCode(templates.security.DummyAuthenticator.class.getName() + ".create", ID_DUMMY); public static final ClassCode LDAP = new ClassCode(templates.security.LdapUserAuthenticator.class.getName() + ".create", ID_LDAP); public static final ClassCode PKCS = new ClassCode(templates.security.PKCSAuthenticator.class.getName() + ".create", ID_PKCS); public static final ClassCode SSL = new ClassCode("SSL", ID_SSL); - private static final ClassCode[] VALUES = new ClassCode[10]; - private static final Map CODE_NAME_MAP = new HashMap(); - - private static byte nextOrdinal = 0; - /** The name of this class. */ private final String name;