[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xmlbeans-cvs
Subject:    cvs commit: xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema StscJavaizer.java
From:       kkrouse () apache ! org
Date:       2004-12-04 0:19:23
Message-ID: 20041204001923.83306.qmail () minotaur ! apache ! org
[Download RAW message or body]

kkrouse     2004/12/03 16:19:23

  Modified:    v2/src/typeimpl/org/apache/xmlbeans/impl/schema
                        StscJavaizer.java
  Log:
  added checks for null BindingConfig
  
  Revision  Changes    Path
  1.12      +6 -3      xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/StscJavaizer.java
  
  Index: StscJavaizer.java
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/StscJavaizer.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- StscJavaizer.java	22 Nov 2004 20:30:11 -0000	1.11
  +++ StscJavaizer.java	4 Dec 2004 00:19:23 -0000	1.12
  @@ -95,6 +95,8 @@
       private static void verifyInterfaceNameCollisions(Set usedNames, StscState state)
       {
           BindingConfig config = state.getBindingConfig();
  +        if (config == null)
  +            return;
   
           InterfaceExtension[] exts = config.getInterfaceExtensions();
           for (int i = 0; i < exts.length; i++)
  @@ -119,11 +121,12 @@
       private static void setExtensions(SchemaTypeImpl sImpl, StscState state)
       {
           String javaName = sImpl.getFullJavaName();
  +        BindingConfig config = state.getBindingConfig();
   
  -        if (javaName != null)
  +        if (javaName != null && config != null)
           {
  -            sImpl.setInterfaceExtensions(state.getBindingConfig().getInterfaceExtensions(javaName));
  -            sImpl.setPrePostExtension(state.getBindingConfig().getPrePostExtension(javaName));
  +            sImpl.setInterfaceExtensions(config.getInterfaceExtensions(javaName));
  +            sImpl.setPrePostExtension(config.getPrePostExtension(javaName));
           }
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlbeans.apache.org
For additional commands, e-mail: commits-help@xmlbeans.apache.org

[prev in list] [next in list] [prev in thread] [next in thread]