mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Nicolas Capponi
26.53.2015 e4d30b2c0703e8d58761812817545c83cce6395e
OPENDJ-1631 Fix NPE when modifying schema from non-server context

Server context may be null in gui/cli tools tools.
1 files modified
7 ■■■■ changed files
opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java 7 ●●●● patch | view | raw | blame | history
opendj-server-legacy/src/main/java/org/opends/server/core/SchemaConfigManager.java
@@ -674,12 +674,15 @@
  private static void registerLdapSyntaxInSchemaNG(ServerContext serverContext, LDAPSyntaxDescription syntaxDescription,
      boolean overwrite)
  {
     // The server context may be null when this code is reached through non-server code (e.g. gui tools)
     if (serverContext != null)
     {
    SchemaUpdater schemaUpdater = serverContext.getSchemaUpdater();
    Syntax.Builder builder = schemaUpdater.getSchemaBuilder()
        .buildSyntax(syntaxDescription.getSyntax());
        Syntax.Builder builder = schemaUpdater.getSchemaBuilder().buildSyntax(syntaxDescription.getSyntax());
    SchemaBuilder schemaBuilder = overwrite ? builder.addToSchemaOverwrite() : builder.addToSchema();
    schemaUpdater.updateSchema(schemaBuilder.toSchema());
  }
  }
  /** Parse the attribute type definitions if there are any. */
  private static void parseAttributeTypeDefinitions(Schema schema,