You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ru...@apache.org on 2001/05/04 23:22:56 UTC

cvs commit: xml-axis/java/src/org/apache/axis/encoding DeserializationContext.java TypeMappingRegistry.java

rubys       01/05/04 14:22:56

  Modified:    java/src/org/apache/axis/encoding
                        DeserializationContext.java
                        TypeMappingRegistry.java
  Log:
  Remove state data from TypeMapping Registry (movement towards the ultimate
  goal of having TypeMappingRegistries being shared and persisted)
  
  Revision  Changes    Path
  1.5       +3 -5      xml-axis/java/src/org/apache/axis/encoding/DeserializationContext.java
  
  Index: DeserializationContext.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/DeserializationContext.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DeserializationContext.java	2001/05/04 19:24:37	1.4
  +++ DeserializationContext.java	2001/05/04 21:22:48	1.5
  @@ -79,7 +79,6 @@
       public DeserializationContext(SOAPSAXHandler baseHandler)
       {
           this.baseHandler = baseHandler;
  -        mappingRegistry.setDeserializationContext(this);
       }
       
       public SOAPSAXHandler getSAXHandler()
  @@ -144,9 +143,6 @@
       public void setTypeMappingRegistry(TypeMappingRegistry reg)
       {
           mappingRegistry = reg;
  -        if (reg != null) {
  -            reg.setDeserializationContext(this);
  -        }
       }
   
       public TypeMappingRegistry getTypeMappingRegistry()
  @@ -167,6 +163,8 @@
       
       public DeserializerBase getDeserializer(QName qName)
       {
  -        return mappingRegistry.getDeserializer(qName);
  +        DeserializerBase dSer = mappingRegistry.getDeserializer(qName);
  +        dSer.setDeserializationContext(this);
  +        return dSer;
       }
   }
  
  
  
  1.6       +0 -7      xml-axis/java/src/org/apache/axis/encoding/TypeMappingRegistry.java
  
  Index: TypeMappingRegistry.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/TypeMappingRegistry.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- TypeMappingRegistry.java	2001/05/04 11:59:05	1.5
  +++ TypeMappingRegistry.java	2001/05/04 21:22:51	1.6
  @@ -81,13 +81,7 @@
       
       Hashtable s;
       Hashtable d;
  -    DeserializationContext context = null;
       
  -    public void setDeserializationContext(DeserializationContext context)
  -    {
  -        this.context = context;
  -    }
  -    
       public void addSerializer(Class _class, QName qName, Serializer serializer) {
           if (s == null) s = new Hashtable();
           s.put(_class, new SerializerDescriptor(qName, serializer));
  @@ -124,7 +118,6 @@
               return null;
           
           DeserializerBase dSer = factory.getDeserializer();
  -        dSer.setDeserializationContext(context);
           return dSer;
       }