Mercurial > jdk8-mips64-public > jaxws / file diff

     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java	Mon Sep 29 11:50:34 2014 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/unmarshaller/XsiNilLoader.java	Sun Aug 31 16:14:36 2014 +0400
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -62,7 +62,7 @@
    1.11                  onNil(state);
    1.12                  boolean hasOtherAttributes = (ea.atts.getLength() - 1) > 0;
    1.13                  // see issues 6759703 and 565 - need to preserve attributes even if the element is nil; only when the type is stored in JAXBElement
    1.14 -                if (!(hasOtherAttributes && (state.prev.target instanceof JAXBElement))) {
    1.15 +                if (!(hasOtherAttributes && (state.getPrev().getTarget() instanceof JAXBElement))) {
    1.16                      return Discarder.INSTANCE;
    1.17                  }
    1.18              }
    1.19 @@ -96,8 +96,8 @@
    1.20          @Override
    1.21          protected void onNil(UnmarshallingContext.State state) throws SAXException {
    1.22              try {
    1.23 -                acc.set(state.prev.target,null);
    1.24 -                state.prev.nil = true;
    1.25 +                acc.set(state.getPrev().getTarget(),null);
    1.26 +                state.getPrev().setNil(true);
    1.27              } catch (AccessorException e) {
    1.28                  handleGenericException(e,true);
    1.29              }
    1.30 @@ -113,7 +113,7 @@
    1.31          @Override
    1.32          protected void onNil(UnmarshallingContext.State state) {
    1.33              // let the receiver add this to the lister
    1.34 -            state.target = null;
    1.35 +            state.setTarget(null);
    1.36          }
    1.37      }
    1.38  }